From 35614ee145b439a812549db272b034ee81f4ced8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:42:13 +0800
Subject: [PATCH] 小程序
---
/dev/null | 39 ---------------------------------------
1 files changed, 0 insertions(+), 39 deletions(-)
diff --git a/minipro_standard/common/config.js b/minipro_standard/common/config.js
deleted file mode 100644
index 81cc111..0000000
--- a/minipro_standard/common/config.js
+++ /dev/null
@@ -1,43 +0,0 @@
-module.exports = {
- // 娴嬭瘯
- baseUrl: 'https://dmtest.ahapp.net/doumeeplant_api',
- // 浠诲悍
- // baseUrl: 'http://192.168.0.129:10021/',
- // 缇氱緤 https://lingyang.mes.show:1801/doumeeplant/doc.html
- // baseUrl: 'https://lingyang.mes.show:1801/doumeeplant',
- // mes
- // baseUrl: 'https://www.mes.red/doumeeplant',
- 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})?$/,
- fileType: [
- { name: '.png', type: 2 },
- { name: '.PNG', type: 2 },
- { name: '.jpg', type: 2 },
- { name: '.JPG', type: 2 },
- { name: '.jpeg', type: 2 },
- { name: '.JPEG', type: 2 },
- { name: '.mp4', type: 1 }
- ],
- Attribute: {
- HH: 'APPLIANCE_MIX',
- HG: 'APPLIANCE_ONTEST',
- BL: 'APPLIANCE_OFFTEST',
- BF: 'APPLIANCE_USELESS'
- },
- QRCodeType: {
- WL: 0, //0
- CK: 1, // 1
- HW: 2, // 2
- GD: 3, // 3
- GZ: 4, // 4
- SB: 5, // 5
- YG: 6, // 6
- ZKD: 7, // 7
- CKD: 8, // 8
- RKD: 9 // 9
- }
-}
diff --git a/minipro_standard/common/css/lib.css b/minipro_standard/common/css/lib.css
deleted file mode 100644
index 48649b7..0000000
--- a/minipro_standard/common/css/lib.css
+++ /dev/null
@@ -1,138 +0,0 @@
-/*-----------------[鍒濆鍖朷--------------*/
-*{ font-family: PingFang SC;}
-/* 娓呯悊娴姩 */
-.cle:after {visibility:hidden;display:block;font-size:0;content:" ";clear:both;height:0;}
-.cle:after{zoom:1;}
-.clear{clear: both;}
-.tc{text-align:center;}
-.tl{text-align:left}
-.tr{text-align:right}
-.fl{float: left;}
-.fr{float: right;}
-
-.wp{ width: 94%; margin: 0 auto;}
-.w30{ width: 30%;}.w40{ width: 40%;}.w47{ width: 47%;}.w48{ width: 48%;}.w49{ width: 49%;}.w50{ width: 50%;}.w60{ width: 60%;}.w80{ width: 80%;}.w90{ width: 90%;}
-
-.bg_m{background-color: #305ED5;}.bg_fa{ background-color: #fafafa;}.bg_f2{ background-color: #f2f2f2;}.bg_f1{ background-color: #f1f1f1;}.bg_f5{ background-color: #f5f5f5;}.bg_f6{ background-color: #f6f6f6;}.bg_f7{ background-color: #f7f7f7;}.bg_f8{ background-color: #f8f8f8;}.bg_e{ background-color: #eee;}.bg_d{ background-color: #ddd;}.bg_w{ background-color: #fff;}.bg_3{ background-color: #333;}
-
-.rd4{border-radius: 4rpx;}.rd5{border-radius: 5rpx;}.rd6{border-radius: 6rpx;}.rd8{border-radius: 8rpx;}.rd10{border-radius: 10rpx;}.rd15{border-radius: 15rpx;}.rd20{border-radius: 20rpx;}.rd30{border-radius: 30rpx;}.rd40{border-radius: 40rpx;}.rd50{border-radius: 50rpx;}.rd60{border-radius: 60rpx;}.rd70{border-radius: 70rpx;}.rd80{border-radius: 80rpx;}.rd90{border-radius: 90rpx;}.rd100{border-radius: 100rpx;}.rd120{border-radius: 120rpx;}.rdhalf{ border-radius:50%}
-
-.ml5{ margin-left: 5rpx;}.ml10{ margin-left: 10rpx;}.ml15{ margin-left: 15rpx;}.ml20{ margin-left: 20rpx;}.ml25{ margin-left: 25rpx;}.ml30{ margin-left: 30rpx;}.ml40{ margin-left: 40rpx;}.ml50{ margin-left: 50rpx;}.ml60{ margin-left: 60rpx;}
-
-.mt5{ margin-top: 5rpx;}.mt10{ margin-top: 10rpx;}.mt15{ margin-top: 15rpx;}.mt20{ margin-top: 20rpx;}.mt25{ margin-top: 25rpx;}.mt30{ margin-top: 30rpx;}.mt35{ margin-top: 35rpx;}.mt40{ margin-top: 40rpx;}.mt45{ margin-top: 45rpx;}.mt50{ margin-top: 50rpx;}.mt60{ margin-top: 60rpx;}.mt70{ margin-top: 70rpx;}.mt80{ margin-top: 80rpx;}.mt90{ margin-top: 90rpx;}.mt100{ margin-top:100rpx;}.mt150{ margin-top:150rpx;}.mt200{ margin-top:200rpx;}.mt-20{ margin-top: -20rpx;}.mt-30{ margin-top: -30rpx;}.mt-40{ margin-top: -40rpx;}
-
-.mb5{ margin-bottom: 5rpx;}.mb10{ margin-bottom: 10rpx;}.mb15{ margin-bottom: 15rpx;}.mb20{ margin-bottom: 20rpx;}.mb25{ margin-bottom: 25rpx;}.mb30{ margin-bottom: 30rpx;}.mb40{ margin-bottom: 40rpx;}.mb50{ margin-bottom: 50rpx;}.mb60{ margin-bottom: 60rpx;}.mb80{ margin-bottom: 80rpx;}.mb100{ margin-bottom: 100rpx;}
-
-.mr5{ margin-right: 5rpx;}.mr10{ margin-right: 10rpx;}.mr15{ margin-right: 15rpx;}.mr20{ margin-right: 20rpx;}.mr25{ margin-right: 25rpx;}.mr30{ margin-right: 30rpx;}.mr40{ margin-right: 40rpx;}.mr60{ margin-right: 60rpx;}.mr80{ margin-right: 80rpx;}.mr100{ margin-right: 100rpx;}
-
-.pl10{ padding-left: 10rpx;}.pl20{ padding-left: 20rpx;}.pl25{ padding-left: 25rpx;}.pl30{ padding-left: 30rpx;}.pl40{ padding-left: 40rpx;}.pl50{ padding-left: 50rpx;}.pl60{ padding-left: 60rpx;}.pl80{ padding-left: 80rpx;}.pl100{ padding-left: 100rpx;}
-
-.pr10{ padding-right: 10rpx;}.pr20{ padding-right: 20rpx;}.pr25{ padding-right: 25rpx;}.pr30{ padding-right: 30rpx;}.pr40{ padding-right: 40rpx;}.pr50{ padding-right: 50rpx;}.pr60{ padding-right: 60rpx;}.pr80{ padding-right: 80rpx;}.pr100{ padding-right: 100rpx;}
-
-.pb10{ padding-bottom: 10rpx;}.pb20{ padding-bottom: 20rpx;}.pb25{ padding-bottom: 25rpx;}.pb30{ padding-bottom: 30rpx;}.pb40{ padding-bottom: 40rpx;}.pb50{ padding-bottom: 50rpx;}.pb100{ padding-bottom: 100rpx;}
-
-.pt10{ padding-top: 10rpx;}.pt20{ padding-top: 20rpx;}.pt25{ padding-top: 25rpx;}.pt30{ padding-top: 30rpx;}.pt40{ padding-top: 40rpx;}.pt50{ padding-top: 50rpx;}.pt100{ padding-top: 100rpx;}
-
-.plr{ padding-left: 30rpx; padding-right: 30rpx;}.plr15{ padding-left: 15rpx; padding-right: 15rpx;}.plr20{ padding-left: 20rpx; padding-right: 20rpx;}.plr25{ padding-left: 25rpx; padding-right: 25rpx;}.plr30{ padding-left: 30rpx; padding-right: 30rpx;}.plr40{ padding-left: 40rpx; padding-right: 40rpx;}.plr50{ padding-left: 50rpx; padding-right: 50rpx;}.plr60{ padding-left: 60rpx; padding-right: 60rpx;}
-
-.ptb10{padding-bottom: 10rpx; padding-top: 10rpx;} .ptb15{padding-bottom: 15rpx; padding-top: 15rpx;} .ptb20{padding-bottom: 20rpx; padding-top: 20rpx;}.ptb25{padding-bottom: 25rpx; padding-top: 25rpx;}.ptb30{padding-bottom: 30rpx; padding-top: 30rpx;}.ptb35{padding-bottom: 35rpx; padding-top: 35rpx;}.ptb40{padding-bottom: 40rpx; padding-top: 40rpx;}.ptb50{padding-bottom: 50rpx; padding-top: 50rpx;}.ptb60{padding-bottom: 60rpx; padding-top: 60rpx;}.ptb80{padding-bottom: 80rpx; padding-top: 80rpx;}.ptb100{padding-bottom: 100rpx; padding-top: 100rpx;}.ptb150{padding-bottom: 150rpx; padding-top: 150rpx;}.ptb200{padding-bottom: 200rpx; padding-top: 200rpx;}
-
-.p5{ padding:5rpx}.p10{ padding:10rpx} .p20{ padding:20rpx}.p30{ padding:30rpx}.p2030{ padding:20rpx 30rpx}.p40{ padding:40rpx}.p3040{ padding:30rpx 40rpx}
-
-.f0{ font-size: 0rpx;}.f20{ font-size: 20rpx;}.f22{ font-size: 22rpx;}.f24{ font-size: 24rpx;}.f26{ font-size: 26rpx;}.f28{ font-size: 28rpx;}.f30{ font-size: 30rpx;}.f32{ font-size: 32rpx;}.f34{ font-size: 34rpx;}.f36{ font-size: 36rpx;} .f38{ font-size: 38rpx;}.f40{ font-size: 40rpx;} .f42{ font-size: 42rpx;}.f44{ font-size: 44rpx;}.f48{ font-size: 48rpx;}.f50{ font-size: 50rpx;}.f60{ font-size: 60rpx;}.f64{ font-size: 64rpx;}.f70{ font-size: 70rpx;}.f80{ font-size: 80rpx;}.f90{ font-size: 90rpx;}.f100{ font-size: 100rpx;}
-
-.img16{ width: 16rpx; height: 16rpx;}
-.img20{ width: 20rpx; height: 20rpx;}
-.img24{ width: 24rpx; height: 24rpx;}
-.img26{ width: 26rpx; height: 26rpx;}
-.img28{ width: 28rpx; height: 28rpx;}
-.img30{ width: 30rpx; height: 30rpx;}
-.img32{ width: 32rpx; height: 32rpx;}
-.img36{ width: 36rpx; height: 36rpx;}
-.img40{ width: 40rpx; height: 40rpx;}
-.img44{ width: 44rpx; height: 44rpx;}
-.img48{ width: 48rpx; height: 48rpx;}
-.img60{ width: 60rpx; height: 60rpx;}
-.img66{ width: 66rpx; height: 66rpx;}
-.img80{ width: 80rpx; height: 80rpx;}
-.img86{ width: 86rpx; height: 86rpx;}
-.img90{ width: 90rpx; height: 90rpx;}
-.img100{ width: 100rpx; height: 100rpx;}
-.img110{ width: 110rpx; height: 110rpx;}
-.img120{ width: 120rpx; height: 120rpx;}
-.img150{ width: 150rpx; height: 150rpx;}
-.img180{ width: 180rpx; height: 180rpx;}
-.img200{ width: 200rpx; height: 200rpx;}
-.imgfull{ width: 100%;}
-
-.rimb{ border-bottom: 1px solid #F1F1F1;}
-.rimt{ border-top: 1px solid #F1F1F1;}
-
-
-.bcover{ background-size: cover; background-position: center center; background-repeat: no-repeat;}
-.bfull{ background-size: 100% 100%; background-position: center center; background-repeat: no-repeat;}
-
-.b{ font-weight: bold;}
-.n{ font-weight: 400;}
-.ibm{ display: inline-block; vertical-align: middle;}
-.bbox{ box-sizing: border-box;}
-.rauto{ margin-left:auto; margin-right:auto}
-.fixedBottom{position: fixed; left: 0; bottom: env(safe-area-inset-bottom); width: 100%;}
-.lh1-6{line-height: 1.6;}
-.lh1-6{line-height: 1.6;}
-.lh1-8{line-height: 1.8;}
-.lh2{line-height: 2;}
-
-.sbtn{ display: inline-block; padding: 0.3em 1em; border: 1rpx solid transparent; box-sizing: border-box; text-align: center;}
-.mini{ font-size: 18rpx;}
-.med{ font-size: 26rpx;}
-.def{ font-size: 34rpx;}
-.sbtn_w100{ width: 100%; padding-left: 0; padding-right: 0;}
-.sbtn_green{ color: #fff; background:#4275FC; }
-.sbtn_green_rim{ color: #4275FC; border-color:#4275FC; }
-.sbtn_black{ color: #fff; background:#333; }
-.sbtn_gray{ color: #333; background:#F7F7F7; }
-.sbtn_black_rim{ color: #333; border-color:#eee; }
-.sbtn_gray_rim{ color: #999; border-color:#ccc; }
-/* flex */
-.flex{ display: flex !important;}
-.cXY{ display: flex; align-items: center;justify-content: center;}
-.cY{ display: flex; align-items: center;}
-.cX{display: flex; justify-content: center}
-.fW{ display: flex; flex-wrap: wrap;}
-.fBW{display: flex; flex-wrap: wrap; justify-content: space-between;}
-.bX{ display: flex; flex-direction: row; justify-content: space-between;}
-.rX{ display: flex; flex-direction: row-reverse;}
-.bY{ display: flex; flex-direction:column; justify-content: space-between;}
-.fY{ display: flex; flex-direction:column;}
-.rY{display: flex; flex-direction: column-reverse;}
-.bcX{ display: flex; justify-content: space-between; align-items: center;}
-.fx1{ flex: 1; }
-.fxo1{ flex: 1; overflow: hidden; }
-
-.cAXY{ position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%);}
-.shadowA{box-shadow: 0 0 5rpx 0 #ddd;}
-.shadowB{ position: relative;}
-.shadowB::after{ content: ""; display: block; width: 100%; height: 8rpx; box-shadow: 0 6rpx 12rpx rgba(0,0,0,.08); top: -8rpx; left: 0; position: absolute; }
-
-.rp { position: relative; }
-.ap { position: absolute; }
-
-.orange{ color: #EA531B !important;}
-.yellow{ color: #F5A400 !important;}.bg_yellow{background-color: #F5A400}
-.green{ color: #00BF97 !important;}.bg_green{background-color: #00BF97}
-.blue{ color: #3C77DA !important;}
-.red{ color: #f00 !important;}
-.white{ color: #fff !important;}
-
-.mc{color:#216EEE !important;}
-.wc{color:#F98107 !important;}
-
-.cm {color: #305ED5}
-.c1{color: #111!important;}.c2{color: #222!important;}.c3{ color: #333!important;}.c6{ color: #666!important;}.cc{ color: #ccc!important;}.cf{ color: #fff!important;}
-/* /deep/ .uicon-close .u-icon--right{ position: absolute; right: 30rpx; top: 30rpx; z-index: 999;} */
-.popCloseBtn{ position: absolute; width:50rpx; height:50rpx; right: 20rpx; top: 20rpx;}
-.fixedTL{ position: absolute; left: 0; top: 0;}
-.fixedTR{ position: absolute; right: 0; top: 0;}
-
-.beyondO { white-space: nowrap; text-overflow: ellipsis; -webkit-text-overflow: ellipsis; overflow: hidden;}
diff --git a/minipro_standard/components/InOutInfo.vue b/minipro_standard/components/InOutInfo.vue
deleted file mode 100644
index 28db2a8..0000000
--- a/minipro_standard/components/InOutInfo.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
- <view class="p30 bg_w f26 info-style">
- <view v-if="isOut" class="cm b f32">璁″垝鍑哄簱鏃ユ湡锛歿{ info.outPlandate||'' }}</view>
- <view v-else class="cm b f32">璁″垝鍏ュ簱鏃ユ湡锛歿{ info.inPlandate || info.planDate || '' }}</view>
- <view class="c2 mt25">
- <text class="c6">鏉ユ簮绫诲瀷锛�</text>
- {{ typeTstr(info.originType) }}
- </view>
- <view class="c2 mt25">
- <text class="c6">鏉ユ簮鍗曞彿锛�</text>
- {{ info.originCode || '-' }}
- </view>
- <view class="c2 mt25">
- <text class="c6">鐢宠浜哄憳锛�</text>
- {{ info.userName ? (info.userName + '/' + info.userDepartName) : (info.inUserName + '/' + info.inDepartName) }}
- </view>
- <view v-if="isOut" class="c2 mt25">
- <text class="c6">鍏ュ簱鎺ユ敹浜猴細</text>
- {{ info.inUserName || '-' }}
- </view>
- <view class="c2 mt25">
- <text class="c6">鐢宠鏃堕棿锛�</text>
- {{ info.createTime || '-' }}
- </view>
- <view v-if="info.remark" class="rd15 ptb25 plr25 bg_f7 mt25">
- <view class="f26 b c2">澶囨敞锛�</view>
- <view class="mt20">
- <u-read-more :showHeight="60" :toggle="true" textIndent="0" closeText="灞曞紑" :shadowStyle="shadowStyle">
- <rich-text :nodes="info.remark"></rich-text>
- <!-- {{ info.remark }} -->
- </u-read-more>
- </view>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- name:"InOutInfo",
- props: {
- isOut: {
- type: Boolean,
- default: true
- },
- info: {
- type: Object,
- default: () => {}
- }
- },
- data() {
- return {
- types: [
- { name: '鍏ㄩ儴', id: '' },
- { name: '閲囪喘璁㈠崟', id: '0' },
- { name: '鐢熶骇宸ュ崟', id: '1' },
- { name: '閿�鍞鍗�', id: '2' },
- { name: '杞簱鍗�', id: '3' },
- { name: '鐩樼偣鍗�', id: '4' },
- ],
- shadowStyle: {
- backgroundImage: "linear-gradient(to top, #f7f7f7, rgba(247, 247, 247, 0.5))",
- paddingTop: "50rpx",
- marginTop: "-50rpx",
- justifyContent: 'flex-end',
- colors: '#333',
- }
- };
- },
- methods: {
- typeTstr(type) {
- let temp = this.types.find(item => item.id == type)
- return temp ? temp.name : '-'
- }
- }
- }
-</script>
-
-<style lang="scss">
-.info-style {
- border-bottom: 20rpx #f7f7f7 solid;
-}
-</style>
\ No newline at end of file
diff --git a/minipro_standard/components/LabelSelection.vue b/minipro_standard/components/LabelSelection.vue
deleted file mode 100644
index 67f65ff..0000000
--- a/minipro_standard/components/LabelSelection.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<template>
- <scroll-view class="tag" scroll-x>
- <view class="tag_list">
- <view v-for="(item, index) in TagList"
- :key="index"
- :class="{'tag_item': true, 'tagActive': index == activeId}"
- @click="change(item, index)">
- <text>{{item.name}}</text>
- <text v-if="isShow && item.num">({{item.num}})</text>
- </view>
- </view>
- </scroll-view>
-</template>
-
-<script>
- export default {
- name: "LabelSelection",
- props: {
- TagList: Array,
- isShow: Boolean
- },
- data() {
- return {
- activeId: 0
- };
- },
- methods: {
- change(item, index) {
- if (this.activeId !== index) {
- this.activeId = index
- this.$emit('change', item.id)
- }
- }
- },
- watch: {
- // TagList: {
- // immediate: true,
- // handler(news, old) {
- // let list = news
- // if (list && list.length !== 0) {
- // this.activeId = list[0].id
- // }
- // }
- // }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .tag::-webkit-scrollbar {
- width: 0 !important;
- }
- .tag::-webkit-scrollbar {
- width: 0 !important;
- height: 0;
- }
- .tag {
- width: 100%;
- padding: 5rpx 0;
- box-sizing: border-box;
- .tag_list {
- width: 100%;
- display: flex;
- align-items: center;
- flex-wrap: nowrap;
- .tagActive {
- background: $nav-color !important;
- text {
- color: #FFFFFF !important;
- }
- }
- .tag_item {
- min-width: 120rpx;
- padding: 14rpx;
- border-radius: 26rpx;
- text-align: center;
- flex-shrink: 0;
- margin-right: 20rpx;
- border: 1rpx solid #CCCCCC;
- font-size: 26rpx;
- font-weight: 400;
- line-height: 26rpx;
- color: #555555;
- }
- }
- }
-</style>
\ No newline at end of file
diff --git a/minipro_standard/components/Preview.vue b/minipro_standard/components/Preview.vue
deleted file mode 100644
index 007ad0f..0000000
--- a/minipro_standard/components/Preview.vue
+++ /dev/null
@@ -1,68 +0,0 @@
-<template>
- <div class="preview">
- <div class="preview_close" @click="closes">
- <u-icon name="close" size="20"></u-icon>
- </div>
- <div class="preview_content">
- <u-swiper :list="list" :autoplay="false" :height="300" bgColor="rgba(0,0,0,0)" :current="current"></u-swiper>
- </div>
- </div>
-</template>
-
-<script>
- export default {
- props: {
- list: {
- type: Array,
- default: []
- },
- current: {
- type: Number,
- default: 0
- }
- },
- methods: {
- closes() {
- this.$emit('close')
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
-.preview {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background: rgba(0, 0, 0, 0.8);
- z-index: 9999;
- .preview_close {
- position: fixed;
- right: 50rpx;
- top: 50rpx;
- width: 70rpx;
- height: 70rpx;
- border-radius: 50%;
- background: #B2B2B2;
- display: flex;
- align-items: center;
- justify-content: center;
- z-index: 99999;
- }
- .preview_content::v-deep {
- position: relative;
- top: 50%;
- left: 0;
- transform: translate(0, -50%);
- .u-swiper {
- width: 100%;
- height: 300rpx !important;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
-}
-</style>
diff --git a/minipro_standard/components/Search.vue b/minipro_standard/components/Search.vue
deleted file mode 100644
index 3f0eff7..0000000
--- a/minipro_standard/components/Search.vue
+++ /dev/null
@@ -1,190 +0,0 @@
-<template>
-
- <view class="search">
- <view class="search_box">
- <view class="search_input">
- <image src="@/static/ic_search@2x.png" alt="">
- <input v-model="text" @confirm="searchInput()" type="text" :placeholder="placeholder" />
- </view>
- <view class="search_operation" v-if="isShow">
- <view class="search_operation_w"></view>
- <image @click="openCate()" src="@/static/filter@2x.png" mode="widthFix">
- </view>
- </view>
- <u-popup closeOnClickOverlay :show="open" @close="close" :round="10" mode="bottom">
- <scroll-view scroll-y class="content">
- <slot name="content"></slot>
- </scroll-view>
- <view class="zhanwei"></view>
- <view class="footer">
- <view class="footer_close" @click="closes">閲嶇疆</view>
- <view class="footer_submit" @click="submit">纭畾</view>
- </view>
- </u-popup>
- </view>
-</template>
-
-<script>
- export default {
- data() {
- return {
- text: '',
- open: false
- };
- },
- props: {
- isShow: Boolean,
- placeholder: String
- },
- methods: {
- // 鎼滅储妗嗘悳绱�
- searchInput() {
- this.$emit('searchInput', this.text)
- },
- // 鎵撳紑寮圭獥
- openCate() {
- this.$emit('scrollerBan', true)
- this.open = true
- },
- close() {
- this.open = false
- this.$emit('scrollerBan', false)
- },
- // 閲嶇疆
- closes() {
- this.open = false
- this.text = ''
- this.$emit('reset', this.text)
- },
- // 鎼滅储鎻愪氦
- submit() {
- this.open = false
- this.$emit('submit')
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .search {
- width: 100%;
- height: 68rpx;
- display: flex;
- align-items: center;
- .zhanwei {
- width: 100%;
- height: calc(88rpx + 30rpx);
- background: #ffffff;
- }
- .content {
- padding: 30rpx 30rpx 0 30rpx;
- width: 100%;
- height: 800rpx;
- box-sizing: border-box;
- }
- .footer {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding-left: 40rpx;
- padding-right: 40rpx;
- padding-bottom: calc(env(safe-area-inset-bottom) + 20rpx);
- box-sizing: border-box;
- position: fixed;
- bottom: 0;
- left: 0;
- background: #ffffff;
- z-index: 99;
- .footer_close {
- flex: 1;
- padding: 28rpx 0;
- height: 88rpx;
- box-sizing: border-box;
- margin-right: 22rpx;
- font-size: 32rpx;
- font-weight: 500;
- color: #999999;
- background: #F7F7F7;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- .footer_submit {
- flex: 1;
- height: 88rpx;
- padding: 28rpx 0;
- box-sizing: border-box;
- font-size: 32rpx;
- font-weight: 500;
- color: #ffffff;
- background: $nav-color;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- .search_box {
- width: 100%;
- display: flex;
- align-items: center;
- .search_input {
- flex: 1;
- height: 100%;
- background: #F7F7F7;
- border-radius: 8rpx;
- display: flex;
- align-items: center;
- padding: 15rpx 30rpx;
- box-sizing: border-box;
- image {
- width: 28rpx;
- height: 28rpx;
- margin-right: 10rpx;
- }
- input {
- width: 100%;
- border: none;
- outline: none;
- background: #F7F7F7;
- font-size: 26rpx;
- }
- input::-webkit-input-placeholder { /* WebKit browsers */
- font-size: 26rpx;
- font-weight: 400;
- color: #B2B2B2;
- }
- input:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
- font-size: 26rpx;
- font-weight: 400;
- color: #B2B2B2;
- }
- input::-moz-placeholder { /* Mozilla Firefox 19+ */
- font-size: 26rpx;
- font-weight: 400;
- color: #B2B2B2;
- }
- input:-ms-input-placeholder { /* Internet Explorer 10+ */
- font-size: 26rpx;
- font-weight: 400;
- color: #B2B2B2;
- }
- }
- .search_operation {
- flex-shrink: 0;
- /*width: 150rpx;*/
- display: flex;
- justify-content: flex-end;
- align-items: center;
- /*margin-left: 30rpx;*/
- image {
- width: 44rpx;
- height: 44rpx;
- }
- .search_operation_w {
- width: 30rpx;
- }
- }
- }
- }
-</style>
\ No newline at end of file
diff --git a/minipro_standard/components/SelectTraMultipleMaterial.vue b/minipro_standard/components/SelectTraMultipleMaterial.vue
deleted file mode 100644
index 23dce2f..0000000
--- a/minipro_standard/components/SelectTraMultipleMaterial.vue
+++ /dev/null
@@ -1,262 +0,0 @@
-<template>
- <u-popup :show="show" :round="10" closeable @close="close()">
- <view class="material-content bbox p30 rp">
- <view class="tc b f32 c2 mb20">閫夋嫨鐗╂枡</view>
- <!-- <v-Search ref="V" @searchInput="searchInput" @submit="submit" :isShow="false" placeholder="鎼滅储鐗╂枡鍚嶇О/缂栫爜">
- </v-Search> -->
- <div class="content_total">鍏眥{pages.total}}鏉℃暟鎹�</div>
- <view class="scroll-content">
- <scroll-view style="height: 100%;" scroll-y="true" refresher-enabled="true" :refresher-triggered="refreshing" @scrolltolower="loadMore"
- @refresherrefresh="onRefresh">
- <view v-for="(item1, index) in list" :key="index" class="flex mb20" @click="selectMaterialAction(index)">
- <view class="img36 mr20 pt10">
- <u-checkbox-group style="display: block;" name="" @change="selectMaterialAction(index)">
- <u-checkbox :checked="selectIndex.includes(index)"></u-checkbox>
- </u-checkbox-group>
- </view>
- <view class="fx1">
- <div class="page_content_title_top">
- <span>{{ item1.materialName + ' | ' + item1.materialCode }}</span>
- </div>
- <div class="page_content_title_bottom">
- <span class="green" v-if="item1.qualityType == 0">
- 鍚堟牸
- <text class="c1" decode>{{ splite }}</text>
- </span>
- <span class="orange" v-else-if="item1.qualityType == 1">
- 涓嶈壇
- <text class="c1" decode>{{ splite }}</text>
- </span>
- <span class="red" v-else-if="item1.qualityType == 2">
- 鎶ュ簾
- <text class="c1" decode>{{ splite }}</text>
- </span>
- <span v-else>
- -
- <text class="c1" decode>{{ splite }}</text>
- </span>
- <span>
- {{item1.procedureName ? item1.procedureName : '-'}}
- <text class="c1" decode>{{ splite }}</text>
- </span>
- <span>{{item1.batch ? item1.batch : '-'}}</span>
- </div>
- <div class="mt20 plr25 ptb20 bg_f7 f26">
- <div class="c2 mb10"><span class="c6">璐т綅锛�</span>{{ item1.locationName }}</div>
- <div class="c2"><span class="c6">鏁伴噺锛�</span>{{ item1.num }}{{ item1.unitName }}</div>
- </div>
- </view>
- </view>
- </scroll-view>
- <!-- <u-list @scrolltoupper="scrolltoupper" @scrolltolower="scrolltolower">
- <u-list-item v-for="(item1, index) in list" :key="index">
-
- </u-list-item>
- </u-list> -->
- </view>
- <view style="height: 98rpx;"></view>
- <!-- <view class="">
- <u-safe-bottom></u-safe-bottom>
- </view> -->
- <view class="fixedBottom bottom cY">
- <view class="fx1 bbox plr30">
- <u-checkbox-group style="display: block;" name="" @change="selectAll()">
- <u-checkbox :checked="isAll" label="鍏ㄩ��"></u-checkbox>
- </u-checkbox-group>
- </view>
- <view class="submit sbtn_green bbox tc" @click="submitAction">{{ `鎻愪氦(${selectIndex.length})`}}</view>
- </view>
- </view>
- </u-popup>
-</template>
-
-<script>
- // import vSearch from '@/components/Search.vue'
- import {
- choiceStockPageByTransfer
- } from '@/util/api/ExWarehouse'
- export default {
- name: "selectTraMultipleMaterial",
- // components: {
- // vSearch
- // },
- data() {
- return {
- show: false,
- splite: ' | ',
- isAll: false,
- refreshing: false,
- pages: {
- capacity: 10,
- page: 1,
- total: 0
- },
- transferId: '',
- warehouseId: '',
- list: [],
- selectIndex: []
- };
- },
- methods: {
- open(target) {
- this.show = true
- this.refreshing = false
- this.isAll = false
- this.transferId = target.transferId
- this.warehouseId = target.warehouseId
- this.list = []
- this.selectIndex = []
-
- // console.log(this.selectIndex);
- this.pages = {
- capacity: 10,
- page: 1,
- total: 0
- }
- this.loadData()
- },
- loadData() {
- choiceStockPageByTransfer({
- ...this.pages,
- model: {
- transferId: this.transferId,
- warehouseId: this.warehouseId
- }
- }).then(res => {
- let {data} = res
- if (data.page == 1) {
- this.list = [];
- }
- this.pages.page = data.page
- this.pages.total = data.total
- this.list.push(...data.records)
- }).catch((err) => {
-
- })
- .finally(() => {
- this.refreshing = false;
- })
- },
- loadMore() {
- this.pages.page += 1
- this.loadData()
- },
- onRefresh() {
- if (this.refreshing) return
- this.refreshing = true;
- this.pages.page = 1
- this.loadData()
- },
- selectMaterialAction(index) {
- let i = this.selectIndex.findIndex(item => item==index)
- if (i == -1 ) {
- this.selectIndex.push(index)
- } else {
- this.selectIndex.splice(i)
- }
- if (this.selectIndex.length == this.list.length) {
- this.isAll = true
- } else {
- this.isAll = false
- }
- },
- selectAll() {
- this.selectIndex = []
- this.isAll = !this.isAll
- if (this.isAll) {
- this.selectIndex = [...new Array(this.list.length).keys()]
- }
-
- },
- submitAction () {
- this.show = false
- let selectValue = []
- this.selectIndex.forEach(item => {
- selectValue.push(this.list[item])
- })
- this.$emit('selectes', { materials: selectValue })
- },
- close() {
- this.show = false
- this.$emit('close')
- }
- }
- }
- /*
- */
-</script>
-
-<style lang="scss" scoped>
- .material-content {
- display: flex;
- flex-direction: column;
- height: 1200rpx;
- box-sizing: border-box;
-
- .scroll-content {
- height: calc(1100rpx - env(safe-area-inset-bottom));
- overflow: scroll;
- }
- }
-
- .content_total {
- margin-top: 20rpx;
- margin-bottom: 20rpx;
- // padding: 24rpx 30rpx;
- // background: #F7F7F7;
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- }
-
- .page_content_title_top {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- span {
- &:nth-child(1) {
- font-size: 30rpx;
- font-weight: 500;
- color: #222222;
- }
-
- &:nth-child(2) {
- flex-shrink: 0;
- font-size: 24rpx;
- font-weight: 400;
- color: #333333;
-
- // span {
- // font-size: 24rpx;
- // color: $nav-color;
- // }
- }
- }
- }
-
- .page_content_title_bottom {
- margin-top: 24rpx;
-
- span {
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- }
- }
-
- .page_content_title {
- display: flex;
- flex-direction: column;
- margin-bottom: 10rpx;
- }
-
- .bottom {
- height: 98rpx;
- .submit {
- width: 272rpx;
- height: 98rpx;
- line-height: 98rpx;
- }
- }
-</style>
diff --git a/minipro_standard/components/myTabber.vue b/minipro_standard/components/myTabber.vue
deleted file mode 100644
index fb67430..0000000
--- a/minipro_standard/components/myTabber.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<template>
- <view>
- <u-tabbar
- :value="index"
- :customStyle="{paddingTop: '5px',paddingBottom: '5px',}"
- @change="change"
- fixed
- activeColor="#222"
- inactiveColor="#666"
- :safeAreaInsetBottom="true">
- <u-tabbar-item text="寰呭姙" :badge="upcomingNum.d">
- <view class="" slot="active-icon">
- <image src="@/static/nav_daiban_sel@2x.png" class="icon-style" mode=""></image>
- </view>
- <view class="" slot="inactive-icon">
- <image src="@/static/nav_daiban@2x.png" class="icon-style" mode=""></image>
- </view>
- </u-tabbar-item>
- <u-tabbar-item text="宸ヤ綔鍙�">
- <view class="" slot="active-icon">
- <image src="@/static/nav_gongzuotai_sel@2x.png" class="icon-style" mode=""></image>
- </view>
- <view class="" slot="inactive-icon">
- <image src="@/static/nav_gongzuotai@2x.png" class="icon-style" mode=""></image>
- </view>
- </u-tabbar-item>
- <u-tabbar-item text="鎴戠殑">
- <view class="" slot="active-icon">
- <image src="@/static/nav_wode_sel@2x.png" class="icon-style" mode=""></image>
- </view>
- <view class="" slot="inactive-icon">
- <image src="@/static/nav_wode@2x.png" class="icon-style" mode=""></image>
- </view>
- </u-tabbar-item>
-
- </u-tabbar>
- </view>
-</template>
-
-<script>
- import { mapState } from 'vuex'
-
- export default {
- name:"myTabbar",
- props: {
- index: 0
- },
- data() {
- return {
- value: 0
- };
- },
- computed: {
- ...mapState(['upcomingNum'])
- },
- methods: {
- click(index) {
- // console.log('click', index);
- // this.$nextTick(() => {
- // this.value = index
- // if (index==0) {
- // uni.switchTab({
- // url: '/pages/index/index'
- // });
- // } else if (index== 1) {
- // uni.switchTab({
- // url: '/pages/service/service'
- // });
- // }else {
- // uni.switchTab({
- // url: '/pages/mine/mine'
- // });
- // }
- // })
- },
- change(index) {
- this.$nextTick(() => {
- this.value = index
- })
-
- console.log(index);
- if (index==0) {
- // console.log('index');
- uni.switchTab({
- url: '/pages/index/index'
- });
- } else if (index== 1) {
- // console.log('workbench');
- uni.switchTab({
- url: '/pages/workbench/workbench'
- });
- }else {
- // console.log('mine');
- uni.switchTab({
- url: '/pages/mine/mine'
- });
- }
- }
- },
- }
- /**
- *
- * */
-</script>
-
-<style lang="scss" scope>
-.icon-style {
- width: 44rpx;
- height: 44rpx;
-}
-</style>
\ No newline at end of file
diff --git a/minipro_standard/components/workOrderInfo.vue b/minipro_standard/components/workOrderInfo.vue
deleted file mode 100644
index 0366b12..0000000
--- a/minipro_standard/components/workOrderInfo.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<template>
- <view class="p30 bg_w order-info">
- <view class="bX">
- <view class="cY">
- <view class="mr10 b">{{ `${orederMessage.mmodel.name || ''} | ${orederMessage.procedureName || ''}`}}
- </view>
- <!-- <u-tag size="mini" bgColor="#03AF76" text="姝ｅ父"></u-tag> -->
- <div class="type bg_green" v-if="orederMessage.type === 0">姝ｅ父</div>
- <div class="type bg_yellow" v-if="orederMessage.type === 2">杩斿伐杩斾慨</div>
- </view>
- <view class="status"
- :class="orederMessage.status==0?'wc':orederMessage.status==1?'green':orederMessage.status==3?'blue':orederMessage.status==7?'green':'c6'">
- {{ stausToStr(orederMessage.status) }}</view>
- </view>
- <view class="f24 c6 mt20">宸ュ崟缂栧彿锛歿{ orederMessage.code || '-' }}</view>
- <view class="f24 mt20 bg_f7 ptb20 plr30 n">
- <view class="c2 mb20">
- <span class="c6">鐗╂枡缂栫爜锛�</span>
- {{ orederMessage.mmodel ? orederMessage.mmodel.code : '-' }}
- </view>
- <view class="c2 mb20">
- <span class="c6">璁″垝寮�宸ワ細</span>
- {{ orederMessage.planDate || '-' }}
- </view>
- <view class="c2 mb20">
- <span class="c6">鐢熶骇鎵规锛�</span>
- {{ orederMessage.batch || '-' }}
- </view>
- <view class="c2 mb20">
- <span class="c6">璁″垝鏁伴噺锛�</span>
- {{ orederMessage.planNum || '-' }}{{ orederMessage.umodel ? orederMessage.umodel.name : '-' }}
- </view>
- <view class="c2 mb20">
- <span class="c6">鐢熶骇璁惧锛�</span>
- {{ orederMessage.pgmodel ? `${orederMessage.pgmodel.code} - ${orederMessage.pgmodel.name}` : '-' }}
- </view>
- <view class="c2 flex">
- <view class="c6" style="flex-shrink: 0;">鐢熶骇浜哄憳锛�</view>
- <view class="flex1">
- {{ orederMessage.proUserList ? orederMessage.proUserList.map(item => item.proUserDepartName).join(' / ') : '-' }}
- </view>
- </view>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- name: "workOrderInfo",
- props: {
- orederMessage: {
- type: Object,
- default: () => {}
- }
- },
- data() {
- return {
- status: [{
- status: 0,
- label: '宸插垱寤�'
- },
- {
- status: 1,
- label: '宸插鏂�'
- },
- {
- status: 2,
- label: '宸插畬宸ユ'
- },
- {
- status: 3,
- label: '宸叉楠�'
- },
- {
- status: 4,
- label: '宸叉姤宸�'
- },
- {
- status: 5,
- label: '宸插叆搴�'
- },
- {
- status: 6,
- label: '宸插彇娑�'
- },
- {
- status: 7,
- label: '鐢熶骇涓�'
- }
- ]
- };
- },
- methods: {
- stausToStr(status) {
- let temp = this.status.find(item => item.status == status)
- return temp ? temp.label : '-'
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .status {
- height: 26rpx;
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- line-height: 26rpx;
- }
-
- .type {
- padding: 0 8rpx;
- color: white;
- margin-left: 10rpx;
- height: 38rpx;
- line-height: 38rpx;
- font-size: 22rpx;
- border: 8rpx;
- }
-
- .order-info {
- border-bottom: 20rpx #f7f7f7 solid;
- }
-</style>
diff --git a/minipro_standard/components/yty-data-picker/yty-data-picker.vue b/minipro_standard/components/yty-data-picker/yty-data-picker.vue
deleted file mode 100644
index f9b8b34..0000000
--- a/minipro_standard/components/yty-data-picker/yty-data-picker.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
- <view>
- <view class="mask_area" @click="handleMaskClick" v-if="show">
- <view class="content_area" @click.stop>
- <view class="search_area">
- <input class="" inputmode="search" type="text" placeholder="璇疯緭鍏ュ叧閿瓧" @confirm="handleSearch" />
- </view>
- <scroll-view class="list_area" scroll-y="true">
- <view>
- <view class="list_item" v-for="item,index in dataList" :key="index" @click="handleSelect(item)">
- {{item.name}}
- </view>
- </view>
- </scroll-view>
- </view>
- </view>
- </view>
-</template>
-
-<script>
- export default {
- props: {
- show: {
- type: Boolean,
- default: false,
- },
- dataList: {
- type: Array,
- default: function() {
- return []
- }
- }
- },
- name: "yty-data-picker",
- data() {
- return {
-
- };
- },
- methods: {
- handleMaskClick() {
- this.$emit('close')
- },
- handleSelect(item) {
- this.$emit('select', item)
- },
- handleSearch(event) {
- this.$emit('search', event.detail.value)
- }
- }
- }
-</script>
-
-<style scoped>
- .mask_area {
- position: fixed;
- top: 0;
- left: 0;
- z-index: 999;
- width: 100%;
- height: 100vh;
- background: rgba(0, 0, 0, 0.6);
- }
-
- .content_area {
- position: fixed;
- bottom: 0;
- left: 0;
- z-index: 1000;
- width: 100%;
- height: 60vh;
- background: #fff;
- display: flex;
- flex-direction: column;
- align-items: center;
- animation: dialog-fade-in 0.3s;
- }
-
- .search_area {
- display: flex;
- align-items: center;
- width: 100%;
- height: 80rpx;
- background-color: #f9f9f9;
- border-radius: 20rpx;
- margin-top: 20rpx;
- padding: 0 30rpx;
- box-sizing: border-box;
- }
-
- .search_area input {
- font-size: 28rpx;
- }
-
- .search_area input::-webkit-input-placeholder {
- font-size: 28rpx;
- }
-
- .search_icon {
- width: 40rpx;
- height: 40rpx;
- margin: 0 15rpx 0 10rpx;
- }
-
- .list_area {
- width: 95%;
- height: 80%;
- margin-top: 20rpx;
- }
-
- .list_item {
- padding: 20rpx;
- border-bottom: 1px solid #f5f5f5;
- font-size: 28rpx;
- }
-
- @keyframes dialog-fade-in {
- 0% {
- transform: translate3d(0, 100%, 0);
- }
-
- 100% {
- transform: translate3d(0, 0, 0);
- }
- }
-</style>
\ No newline at end of file
diff --git a/minipro_standard/main.js b/minipro_standard/main.js
deleted file mode 100644
index bb6974a..0000000
--- a/minipro_standard/main.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import Vue from 'vue'
-import App from './App'
-import mixin from './common/mixin'
-
-// 寮曞叆鍏ㄥ眬uView
-import uView from '@/uni_modules/uview-ui'
-Vue.use(uView)
-// vuex
-import store from './store'
-Vue.prototype.$store = store
-store.dispatch('getHeight')
-Vue.config.productionTip = false
-App.mpType = 'app'
-// console.log(uni.$u);
-// #ifdef MP
-// 寮曞叆uView瀵瑰皬绋嬪簭鍒嗕韩鐨刴ixin灏佽
-const mpShare = require('@/uni_modules/uview-ui/libs/mixin/mpShare.js')
-Vue.mixin(mpShare)
-// #endif
-Vue.mixin(mixin)
-// 寮曞叆璇锋眰灏佽
-const app = new Vue({
- store,
- ...App
-})
-require('./util/request/index')(app)
-// 鑾峰彇寰呭姙鏁伴噺
-// store.dispatch('getUpcomingNum')
-
-app.$mount()
\ No newline at end of file
diff --git a/minipro_standard/manifest.json b/minipro_standard/manifest.json
deleted file mode 100644
index 6bad2a5..0000000
--- a/minipro_standard/manifest.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
- "name": "DM浜戝伐鍘�",
- "appid": "",
- "description": "",
- "versionName": "1.0.0",
- "versionCode": "100",
- "transformPx": false,
- /* 5+App鐗规湁鐩稿叧 */
- "app-plus": {
- "usingComponents": true,
- "nvueStyleCompiler": "uni-app",
- "compilerVersion": 3,
- "splashscreen": {
- "alwaysShowBeforeRender": true,
- "waiting": true,
- "autoclose": true,
- "delay": 0
- },
- /* 妯″潡閰嶇疆 */
- "modules": {},
- /* 搴旂敤鍙戝竷淇℃伅 */
- "distribute": {
- /* android鎵撳寘閰嶇疆 */
- "android": {
- "permissions": [
- "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
- "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
- "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
- "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CAMERA\"/>",
- "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
- "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
- "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
- "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
- "<uses-feature android:name=\"android.hardware.camera\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
- ]
- },
- /* ios鎵撳寘閰嶇疆 */
- "ios": {},
- /* SDK閰嶇疆 */
- "sdkConfigs": {}
- }
- },
- /* 蹇簲鐢ㄧ壒鏈夌浉鍏� */
- "quickapp": {},
- /* 灏忕▼搴忕壒鏈夌浉鍏� */
- "mp-weixin": {
- "appid": "wx1605a61f7a48cea6",
- "setting": {
- "urlCheck": false,
- "es6": true,
- "postcss": true,
- "minified": true,
- "ignoreDevUnusedFiles": false,
- "ignoreUploadUnusedFiles": false
- },
- "usingComponents": true,
- "requiredPrivateInfos": ["getLocation"],
- "permission": {}
- },
- "mp-alipay": {
- "usingComponents": true
- },
- "mp-baidu": {
- "usingComponents": true
- },
- "mp-toutiao": {
- "usingComponents": true
- },
- "uniStatistics": {
- "enable": false
- },
- "vueVersion": "2",
- "h5": {
- "router": {
- "mode": "hash",
- "base": "/h5/"
- },
- "template": "index.html",
- "title": "DM浜戝伐鍘�",
- "sdkConfigs": {
- "maps": {}
- },
- "devServer": {
- "port": 1801,
- "proxy": {
- "^/doumeeplant_api": {
- "target": "https://dmtest.ahapp.net/doumeeplant_api",
- "ws": true,
- "changeOrigin": true,
- "pathRewrite": {
- "^/doumeeplant_api": ""
- }
- }
- }
- }
-
- }
-}
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
deleted file mode 100644
index 41c2076..0000000
--- a/minipro_standard/pages.json
+++ /dev/null
@@ -1,316 +0,0 @@
-{
- "pages": [{
- "path": "pages/workbench/workbench",
- "style": {
- "navigationBarTitleText": "宸ヤ綔鍙�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/index/index",
- "style": {
- "navigationBarTitleText": "",
- "navigationStyle": "custom"
- }
- }, {
- "path": "pages/mine/mine",
- "style": {
- "navigationBarTitleText": "鎴戠殑",
- "enablePullDownRefresh": false
- }
- }, {
- "path": "pages/login/login",
- "style": {
- "navigationBarTitleText": "鐧诲綍",
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
- }, {
- "path": "pages/personal/personal",
- "style": {
- "navigationBarTitleText": "涓汉淇℃伅",
- "enablePullDownRefresh": false
- }
- }, {
- "path": "pages/changePassword/changePassword",
- "style": {
- "navigationBarTitleText": "淇敼瀵嗙爜",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "pages/updatePhone/updatePhone",
- "style": {
- "navigationBarTitleText": "鏇存柊鎵嬫満鍙�",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "pages/updateMailbox/updateMailbox",
- "style": {
- "navigationBarTitleText": "鏇存柊閭鍙�",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "pages/plannedProgress/plannedProgress",
- "style": {
- "navigationBarTitleText": "璁″垝杩涘害",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "pages/planDetails/planDetails",
- "style": {
- "navigationBarTitleText": "璁″垝璇︽儏",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "pages/plannedDistribution/plannedDistribution",
- "style": {
- "navigationBarTitleText": "璁″垝鍒嗛厤",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "pages/allocation/allocation",
- "style": {
- "navigationBarTitleText": "閫夋嫨",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "pages/inspectComplete/inspectComplete",
- "style": {
- "navigationBarTitleText": "瀹屽伐妫�",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "pages/selectWorkOrder/selectWorkOrder",
- "style": {
- "navigationBarTitleText": "閫夋嫨宸ュ崟",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "pages/inspectPatrol/inspectPatrol",
- "style": {
- "navigationBarTitleText": "宸℃",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "pages/linePatrol/linePatrol",
- "style": {
- "navigationBarTitleText": "宸＄嚎",
- "enablePullDownRefresh": false
- }
-
- }
- ],
- "subPackages": [{
- "root": "pages_adjust",
- "pages": [{
- "path": "pages/newOutbound/newOutbound",
- "style": {
- "navigationBarTitleText": "鏂板缓鍑哄簱",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/addReceipt/addReceipt",
- "style": {
- "navigationBarTitleText": "鏂板缓鍏ュ簱",
- "enablePullDownRefresh": false
- }
- },
- {
- "path" : "pages/forgotPassword/forgotPassword",
- "style" :
- {
- "navigationBarTitleText": "蹇樿瀵嗙爜",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/newTransfer/newTransfer",
- "style": {
- "navigationBarTitleText": "鏂板缓杞簱",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/manualFeed/manualFeed",
- "style": {
- "navigationBarTitleText": "鎵嬪姩鎶曟枡",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/OrderDetail/OrderDetail",
- "style": {
- "navigationBarTitleText": "宸ュ崟璇︽儏",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/workOrderReporting/workOrderReporting",
- "style": {
- "navigationBarTitleText": "宸ュ崟鎶ュ伐",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/transferList/transferList",
- "style": {
- "navigationBarTitleText": "杞簱鍒楄〃",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/warehousingDetails/warehousingDetails",
- "style": {
- "navigationBarTitleText": "杞簱璇︽儏",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/outboundList/outboundList",
- "style": {
- "navigationBarTitleText": "鍑哄簱鍗曞垪琛�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/outboundDetails/outboundDetails",
- "style": {
- "navigationBarTitleText": "鍑哄簱璇︽儏",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/warehousingList/warehousingList",
- "style": {
- "navigationBarTitleText": "鍏ュ簱鍗曞垪琛�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/warehousingDetails1/warehousingDetails1",
- "style": {
- "navigationBarTitleText": "鍏ュ簱璇︽儏",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/InventoryQuery/InventoryQuery",
- "style": {
- "navigationBarTitleText": "搴撳瓨閲忔煡璇�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/reportingForWork/reportingForWork",
- "style": {
- "navigationBarTitleText": "涓�閿姤宸�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/processPlan/processPlan",
- "style": {
- "navigationBarTitleText": "閫夋嫨宸ュ簭璁″垝",
- "enablePullDownRefresh": false
- }
- }, {
- "path": "pages/workOrder/workOrder",
- "style": {
- "navigationBarTitleText": "鐢熶骇宸ュ崟",
- "enablePullDownRefresh": false
- }
-
- }, {
- "path": "pages/spotCheck/spotCheck",
- "style": {
- "navigationBarTitleText": "鐢熶骇鐐规",
- "enablePullDownRefresh": false
- }
-
- }
- ]
- },
- {
- "root": "pages_inspect",
- "pages": [
- {
- "path": "pages/OutOperation/OutOperation",
- "style": {
- "navigationBarTitleText": "鍑哄簱鎿嶄綔",
- "enablePullDownRefresh": false
- }
- }, {
- "path": "pages/InOperation/InOperation",
- "style": {
- "navigationBarTitleText": "鍏ュ簱鎿嶄綔",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/InspectionRecords/InspectionRecords",
- "style": {
- "navigationBarTitleText": "妫�楠岃褰�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/InspectionDetails/InspectionDetails",
- "style": {
- "navigationBarTitleText": "妫�楠岃鎯�",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "pages/equipmentInspection/equipmentInspection",
- "style": {
- "navigationBarTitleText": "璁惧宸℃",
- "enablePullDownRefresh": false
- }
- }
- ]
- }
- ],
- "globalStyle": {
- "navigationBarTextStyle": "black",
- "navigationBarTitleText": "uni-app",
- "navigationBarBackgroundColor": "#ffffff",
- "backgroundColor": "#ffffff"
- },
- "tabBar": {
- "color": "#666666",
- "selectedColor": "#222222",
- "borderStyle": "black",
- "backgroundColor": "#fff",
- "list": [{
- "pagePath": "pages/index/index",
- "iconPath": "static/nav_daiban@2x.png",
- "selectedIconPath": "static/nav_daiban_sel@2x.png",
- "text": "寰呭姙"
- },
- {
- "pagePath": "pages/workbench/workbench",
- "iconPath": "static/nav_gongzuotai@2x.png",
- "selectedIconPath": "static/nav_gongzuotai_sel@2x.png",
- "text": "宸ヤ綔鍙�"
- },
- {
- "pagePath": "pages/mine/mine",
- "iconPath": "static/nav_wode@2x.png",
- "selectedIconPath": "static/nav_wode_sel@2x.png",
- "text": "鎴戠殑"
- }
- ]
- },
- "uniIdRouter": {}
-}
diff --git a/minipro_standard/pages/allocation/allocation.vue b/minipro_standard/pages/allocation/allocation.vue
deleted file mode 100644
index 86e5f83..0000000
--- a/minipro_standard/pages/allocation/allocation.vue
+++ /dev/null
@@ -1,348 +0,0 @@
-<template>
- <view class="fp">
- <view class="fp_list">
- <view class="fp_list_item">
- <view class="fp_list_item_left">
- <text style="color: #f00;">*</text>
- <text>璁″垝鐢熶骇鏁伴噺锛�</text>
- </view>
- <view class="fp_list_item_right">
- <u--input placeholder="璇疯緭鍏�" :customStyle="{width: '180rpx'}" inputAlign="right" type="number" border="surround" v-model="form.num"></u--input>
- </view>
- </view>
- <view class="fp_list_item">
- <view class="fp_list_item_left">
- <text style="color: #f00;">*</text>
- <text>璁″垝寮�宸ユ棩鏈燂細</text>
- </view>
- <view class="fp_list_item_right" @click="timeShow = true">
- <text class="black" v-if="form.startTime">{{form.startTime}}</text>
- <text v-else>骞� / 鏈� / 鏃�</text>
- <u-icon name="arrow-right" color="#999999"></u-icon>
- </view>
- </view>
- <view class="fp_list_item" @click="show1 = true">
- <view class="fp_list_item_left">
- <text>鐢熶骇璁惧</text>
- </view>
- <view class="fp_list_item_right">
- <text v-if="form.equipmentName" class="black">{{form.equipmentName}}</text>
- <text v-else>璇烽�夋嫨</text>
- <u-icon name="arrow-right" color="#999999"></u-icon>
- </view>
- </view>
- <view class="fp_list_item1" v-show="form.equipmentName">
- <view class="fp_list_item_left">
- <text>鐢熶骇浜哄憳</text>
- </view>
- <view class="fp_list_item_right">
- <template v-if="personnelData.length > 0">
- <u-checkbox-group
- placement="column"
- @change="checkboxChange">
- <u-checkbox
- :customStyle="{marginBottom: '16rpx'}"
- v-for="(item, index) in personnelData"
- :key="index"
- :label="item.text"
- :name="item.id">
- </u-checkbox>
- </u-checkbox-group>
- </template>
- <view class="wu" v-else>
- <text>鏆傛棤鏁版嵁</text>
- </view>
- </view>
- </view>
- </view>
- <view class="fp_footer">
- <view class="fp_footer_close" @click="go">鍙栨秷</view>
- <button class="fp_footer_submit" @click="submit">纭</button>
- </view>
- <!-- 閫夋嫨鏃ユ湡 -->
- <!-- <u-calendar :show="timeShow" @close="timeShow = false" @confirm="timeConfirm"></u-calendar> -->
- <l-calendar :lunar="false" v-model="timeShow" @change="timeConfirm" :isRange="true" activeBgColor="#305ED5"
- rangeColor="#305ED5" rangeBgColor="rgba(48, 80, 213, 0.1)"></l-calendar>
- <!-- 閫夋嫨璁惧 -->
- <u-picker :show="show1" :columns="equipment" @confirm="confirm" @cancel="show1 = false" keyName="text"></u-picker>
- </view>
-</template>
-
-<script>
- import { gsdate } from '@/util/utils.js'
- import { distributeById, getFindAll, getDeviceByCondition } from '@/util/api/PlanningAPI'
- export default {
- data() {
- return {
- id: null,
- show1: false,
- checkboxValue1: [],
- form: {
- num: '', // 鐢熶骇鏁伴噺
- startTime: gsdate(new Date()), // 寮�濮嬫椂闂�
- equipmentId: '', // 璁惧id
- equipmentName: '', // 璁惧鍚嶇О
- personnelId: [] // 浜哄憳id
- },
- isOpenDate: false,
- equipment: [], // 璁惧鏁版嵁
- personnelData: [], // 浜哄憳鏁版嵁
- timeShow: false
- };
- },
- onLoad(option) {
- this.form.num = option.num
- this.id = option.jhid
- this.getDeviceByConditions()
- },
- methods: {
- checkboxChange(ids) {
- this.form.personnelId = ids;
- },
- go() {
- uni.navigateBack({ delta: 1 });
- },
- // 纭閫夋嫨璁惧
- confirm(val) {
- this.form.equipmentId = val.value[0].id
- this.form.equipmentName = val.value[0].text
- this.personnelData = []
- this.getUser()
- },
- timeConfirm(val) {
- // this.form.startTime = val[0]
- this.listData.startDate = val.startDate
- this.listData.endDate = val.endDate
- this.timeShow = false
- },
- // 鎻愪氦鍒嗛厤
- submit() {
- if (!this.form.num) return uni.showToast({ title: '璁″垝鐢熶骇鏁伴噺涓嶈兘涓虹┖锛�', icon: 'none', duration: 2000 });
- if (!this.form.startTime) return uni.showToast({ title: '璁″垝寮�濮嬫棩鏈熶笉鑳戒负绌猴紒', icon: 'none', duration: 2000 });
- distributeById({
- planId: this.id,
- planNum: this.form.num,
- planDate: this.form.startTime,
- proGroupId: this.form.equipmentId,
- proUserList: this.form.personnelId
- }).then(res => {
- if (res.code === 200) {
- uni.showToast({ title: '鍒嗛厤鎴愬姛', icon: 'success', duration: 2000, mask: true });
- setTimeout(() => {
- uni.$emit('update', { msg:'鍒锋柊鍒楄〃' })
- uni.navigateBack({ delta: 1 });
- }, 2000)
- }
- })
- },
- // 鏌ヨ璁惧
- getDeviceByConditions() {
- getDeviceByCondition({})
- .then(res => {
- if (res.code === 200) {
- this.equipment = []
- let arr = []
- res.data.forEach((element) => {
- arr.push({ text: element.code + '-' + element.name, id: element.id, checked: false })
- })
- this.form.equipmentId = arr[0].id
- this.form.equipmentName = arr[0].text
- this.getUser()
- this.equipment.push(arr)
- }
- })
- },
- getUser() {
- getFindAll({
- deviceId: this.form.equipmentId
- }).then(res => {
- if (res.code === 200 && res.data && res.data.length !== 0) {
- this.form.personnelId = []
- let arr = []
- res.data.forEach((item) => {
- arr.push({ text: item.dmodel.name + '-' + item.umodel.name, id: item.userId })
- })
- this.personnelData = arr
- }
- this.show1 = false
- })
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
-.fp {
- width: 100%;
- height: 100%;
- position: absolute;
- background: #F7F7F7;
- .fp_list {
- display: flex;
- flex-direction: column;
- .fp_list_item1 {
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- padding: 20rpx 30rpx;
- box-sizing: border-box;
- background: #ffffff;
- border-bottom: 1rpx solid #ececec;
- .fp_list_item_left {
- flex-shrink: 0;
- margin-bottom: 40rpx;
- display: flex;
- align-items: center;
- text {
- color: #222222;
- font-size: 30rpx;
- font-weight: 400;
- }
- }
- .fp_list_item_right::v-deep {
- display: flex;
- flex-direction: column;
- .u-checkbox-group--row {
- display: flex;
- flex-direction: column;
- }
- .u-icon__icon {
- margin-right: 0 !important;
- }
- .fp_list_item_right_dis {
- display: flex;
- align-items: center;
- margin-bottom: 20rpx;
- &:last-child {
- margin-bottom: 0 !important;
- }
- }
- .wu {
- width: 100%;
- margin: 30rpx 0;
- display: flex;
- align-items: center;
- justify-content: center;
- text {
- font-size: 26rpx;
- color: black;
- }
- }
- .black {
- color: black !important;
- }
- // input {
- // width: 180rpx;
- // height: 60rpx;
- // border-radius: 8rpx;
- // border: 2rpx solid #E5E5E5;
- // padding: 0 30rpx;
- // text-align: right;
- // font-size: 25rpx;
- // }
- text {
- font-size: 28rpx;
- font-weight: 400;
- color: #999999;
- margin-right: 20rpx;
- }
- }
- }
- .fp_list_item {
- display: flex;
- justify-content: space-between;
- align-items: center;
- padding: 0 30rpx;
- height: 98rpx;
- box-sizing: border-box;
- background: #ffffff;
- border-bottom: 1rpx solid #ececec;
- .fp_list_item_left {
- flex-shrink: 0;
- b {
- color: $nav-stateColor4;
- font-size: 28rpx;
- margin-right: 5rpx;
- }
- text {
- color: #222222;
- font-size: 30rpx;
- font-weight: 400;
- }
- }
- .fp_list_item_right::v-deep {
- display: flex;
- align-items: center;
- .u-icon__icon {
- margin-right: 0 !important;
- }
- .wu {
- text-align: center;
- text {
- font-size: 26rpx;
- color: black;
- }
- }
- .black {
- color: black !important;
- }
- // input {
- // width: 180rpx;
- // height: 60rpx;
- // border-radius: 8rpx;
- // border: 1rpx solid #E5E5E5;
- // padding: 0 30rpx;
- // text-align: right;
- // font-size: 25rpx;
- // }
- text {
- font-size: 28rpx;
- font-weight: 400;
- color: #999999;
- margin-right: 20rpx;
- }
- }
- }
- }
- .fp_footer {
- width: 100%;
- padding-left: 30rpx;
- padding-right: 30rpx;
- padding-bottom: 68rpx;
- box-sizing: border-box;
- position: fixed;
- bottom: 0;
- left: 0;
- display: flex;
- align-items: center;
- justify-content: space-between;
- .fp_footer_close {
- width: 334rpx;
- height: 88rpx;
- background: #FFFFFF;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- font-size: 30rpx;
- font-weight: 500;
- color: #666666;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- .fp_footer_submit {
- width: 334rpx;
- height: 88rpx;
- border: none;
- background: $nav-color;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- font-size: 30rpx;
- font-weight: 500;
- color: #ffffff;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
-}
-</style>
diff --git a/minipro_standard/pages/changePassword/changePassword.vue b/minipro_standard/pages/changePassword/changePassword.vue
deleted file mode 100644
index 51fb0b2..0000000
--- a/minipro_standard/pages/changePassword/changePassword.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
- <view class="password">
- <view class="password_tip">
- <image src="@/static/password_ic_tip@2x.png" alt="" />
- <text>瀵嗙爜鐢�6-20涓嫳鏂囧瓧姣嶃�佹暟瀛楁垨绗﹀彿缁勬垚</text>
- </view>
- <view class="password_list">
- <view class="password_list_item">
- <text>鍘熷瘑鐮�</text>
- <view class="password_list_item_box">
- <input type="password" v-model="form.originalPassword" maxlength="20" placeholder="璇疯緭鍏ュ師瀵嗙爜">
- </view>
- <text class="password_list_item_btn" @click="forgotPassword">蹇樿瀵嗙爜</text>
- </view>
- <view class="password_list_item">
- <text>鏂板瘑鐮�</text>
- <view class="password_list_item_box">
- <input type="password" v-model="form.newPassword" maxlength="20" placeholder="璇疯緭鍏ユ柊瀵嗙爜">
- </view>
- </view>
- <view class="password_list_item">
- <text>纭瀵嗙爜</text>
- <view class="password_list_item_box">
- <input type="password" v-model="form.confirmPassword" maxlength="20" placeholder="鍐嶆杈撳叆鏂板瘑鐮�">
- </view>
- </view>
- </view>
- <view class="password_footer">
- <button class="password_footer_submit" @click="submit">
- <text>瀹屾垚</text>
- </button>
- </view>
- </view>
-</template>
-
-<script>
- import { updatePwd } from '@/util/api/PersonalAPI'
- export default {
- data() {
- return {
- form: {
- originalPassword: '',
- newPassword: '',
- confirmPassword: ''
- }
- };
- },
- methods: {
- // 蹇樿瀵嗙爜
- forgotPassword() {
- uni.navigateTo({
- url: '/pages_adjust/pages/forgotPassword/forgotPassword'
- });
- },
- // 鎻愪氦淇敼
- submit() {
- if (!this.form.originalPassword) {
- uni.showToast({ title: '鍘熷瘑鐮佷笉鑳戒负绌�', icon: 'none', duration: 2000 });
- } else if (!this.form.newPassword) {
- uni.showToast({ title: '鏂板瘑鐮佷笉鑳戒负绌�', icon: 'none', duration: 2000 });
- } else if (!/^([a-z0-9\.\@\!\#\(/)/$\%\^\&\*\(\)]){6,20}$/i.test(this.form.newPassword)) {
- uni.showToast({ title: '瀵嗙爜鏍煎紡涓嶆纭�', icon: 'none', duration: 2000 });
- } else if (!this.form.confirmPassword) {
- uni.showToast({ title: '纭瀵嗙爜涓嶈兘涓虹┖', icon: 'none', duration: 2000 });
- } else if (this.form.newPassword !== this.form.confirmPassword) {
- uni.showToast({ title: '涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�', icon: 'none', duration: 2000 });
- } else {
- updatePwd({
- newPwd: this.form.newPassword,
- oldPwd: this.form.originalPassword
- }).then(res => {
- if (res.code === 200) {
- uni.showToast({ title: '淇敼鎴愬姛', icon: 'success', duration: 2000, mask: true });
- setTimeout(() => {
- uni.navigateBack({ delta: 1 });
- }, 2000)
- }
- })
- }
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .password {
- position: absolute;
- width: 100%;
- height: 100%;
- background: white;
- .password_tip {
- height: 72rpx;
- display: flex;
- align-items: center;
- background: #F7F7F7;
- padding: 0 30rpx;
- image {
- width: 24rpx;
- height: 24rpx;
- margin-right: 10rpx;
- }
- text {
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- }
- }
- .password_list {
- padding: 0 30rpx;
- .password_list_item {
- display: flex;
- align-items: center;
- height: 90rpx;
- border-bottom: 1rpx solid #E5E5E5;
- text {
- width: 150rpx;
- flex-shrink: 0;
- font-size: 30rpx;
- font-weight: 400;
- color: #222222;
- }
- .password_list_item_btn {
- text-align: right;
- font-size: 26rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #4275FC;
- }
- .password_list_item_box {
- display: flex;
- justify-content: space-between;
- flex: 1;
- input {
- border: none;
- font-size: 30rpx;
- }
- input::-webkit-input-placeholder {
- font-size: 28rpx;
- font-weight: 400;
- color: #B2B2B2;
- }
- p {
- font-size: 26rpx;
- font-weight: 400;
- color: #4275FC;
- }
- }
- }
- }
- .password_footer {
- margin-top: 80rpx;
- padding: 0 30rpx;
- .password_footer_submit {
- width: 100%;
- height: 88rpx;
- border: none;
- background: #4275FC;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- text {
- font-size: 30rpx;
- font-weight: 500;
- color: #FFFFFF;
- }
- }
- }
- }
-</style>
diff --git a/minipro_standard/pages/index/index.vue b/minipro_standard/pages/index/index.vue
deleted file mode 100644
index 4a5050c..0000000
--- a/minipro_standard/pages/index/index.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<template>
- <page-meta :page-style="ban ?'overflow: hidden;': ''"/>
- <view class="index" >
- <!-- :class="ban?'scroll-ban': ''" -->
- <!-- <view class="mask" @tap="tapMask" @touchmove="moveHandle"></view> -->
- <!-- <web-view v-if="show" @onPostMessage="onMessage" :src="'https://dmtest.ahapp.net/doumeeplant_h5/#/appletLogin?code=' + code"></web-view> -->
- <!-- {{$store.state.statusbarHeight}} -->
-
- <u-sticky>
- <view class="plr30 pb30 nav-style bg_w">
- <view
- :style="{background: '#fff', zIndex: '999', paddingTop: `${statusbarHeight}px`, height: `${navHeight}px`, lineHeight:`${navHeight}px`, textAlign: 'center'}">
- 寰呭姙</view>
- <div class="content_search">
- <v-Search @searchInput="searchInput" @submit="confirm" @reset="resetType" :isShow="true"
- placeholder="鎼滅储鍏抽敭瀛�" @scrollerBan="$event => ban=$event">
- <template v-slot:content>
- <view class="rp contanir">
- <view class="c2 b">绫诲瀷</view>
- <view class="content">
- <u-grid col="2" :border="false">
- <u-grid-item v-for="item in types" :key="item.id">
- <view class="ptb20 f26 c9 type-style tc rd10" :class="type===item.id?'sbtn_green':'sbtn_gray'"
- @click="type=item.id">{{ item.name }}</view>
- </u-grid-item>
- </u-grid>
- </view>
- <!-- <view class="flex ap tc bottom-view">
- <view class="fx1 ptb20 sbtn_gray c9" @click="resetType">閲嶇疆</view>
- <view class="fx1 ml20 ptb20 sbtn_green" @click="confirm">纭畾</view>
- </view> -->
- </view>
- </template>
- </v-Search>
- <div class="content_search_x"></div>
- <LabelSelection :TagList="tagList" :isShow="true" @change="clickTag"></LabelSelection>
- </div>
- </view>
- </u-sticky>
-
- <scroll-view :style="{height: height}" v-if="projectList.length" scroll-y refresher-enabled="true" :refresher-triggered="triggered" @scrolltolower="loadMore"
- @refresherrefresh="refresh"
- >
- <view v-for="(item, index) in projectList" :key="index">
- <view class="box_list">
- <view class="box_list_item" @click="jump(item)">
- <view class="box_list_item_icon">
- <image src="../../static/daiban_ic_daiban@2x.png" mode=""></image>
- </view>
- <view class="box_list_item_nr">
- <view class="box_list_item_nr_top">
- <span>{{item.title}}</span>
- <span>{{item.createTime}}</span>
- </view>
- <view class="box_list_item_nr_bottom">
- {{item.content}}
- </view>
- </view>
- </view>
- </view>
- </view>
- </scroll-view>
- <view v-else class="tc c6">鏆傛棤鏁版嵁...</view>
- <!-- <u-popup :show="show" @close="close" :round="8" zIndex="20000">
- <view class="rp p40 contanir">
- <view class="c2 b">绫诲瀷</view>
- <view class="content">
- <u-grid col="2" :border="false">
- <u-grid-item v-for="item in types" :key="item.id">
- <view class="ptb20 f26 c9 type-style tc rd10" :class="type===item.id?'sbtn_green':'sbtn_gray'"
- @click="type=item.id">{{ item.name }}</view>
- </u-grid-item>
- </u-grid>
- </view>
- <view class="flex ap tc bottom-view">
- <view class="fx1 ptb20 sbtn_gray c9" @click="resetType">閲嶇疆</view>
- <view class="fx1 ml20 ptb20 sbtn_green" @click="confirm">纭畾</view>
- </view>
- </view> -->
- </u-popup>
- <myTabbar :index="0" />
- </view>
-</template>
-
-<script>
- import myTabbar from "@/components/myTabber.vue"
- import vSearch from '@/components/Search.vue'
- import LabelSelection from '@/components/LabelSelection.vue'
- import {
- getList,
- pageCount
- } from '@/util/api/agencyAPI'
- import {
- mapState
- } from 'vuex'
- export default {
- components: {
- myTabbar,
- vSearch,
- LabelSelection
- },
- data() {
- return {
- ban: false,
- height: '',
- top: '',
- code: '',
- windowHeight: '',
- show: false,
- types: [{
- id: 0,
- name: '杞﹂棿棰嗘枡-寰呭彂璐�'
- },
- {
- id: 1,
- name: '杞﹂棿棰嗘枡-寰呭叆搴�'
- },
- {
- id: 2,
- name: '鏈哄彴澶囨枡-寰呭彂璐�'
- },
- {
- id: 3,
- name: '鏈哄彴澶囨枡-寰呭叆搴�'
- },
- {
- id: 4,
- name: '瀹屽伐鍏ュ簱-寰呮帴鏀�'
- },
- {
- id: 5,
- name: '搴撳瓨杞簱-寰呭彂璐�'
- },
- {
- id: 6,
- name: '搴撳瓨杞簱-寰呭叆搴�'
- },
- {
- id: 7,
- name: '鐢宠瀹℃壒'
- },
- {
- id: 8,
- name: '瀹㈤��/杩斿搧鍥炲巶妫�楠�'
- }
- ],
- tagList: [{
- id: 0,
- name: '寰呭姙',
- num: 0
- },
- {
- id: 1,
- name: '宸插姙',
- num: 0
- }
- ],
- type: '',
- searchForm: {
- mixParam: '',
- status: 0,
- type: ''
- },
- page: {
- total: 0,
- capacity: 10,
- page: 1,
- },
- triggered: false,
- finished: false,
- projectList: []
- }
- },
- computed: {
- ...mapState(['statusbarHeight', 'navHeight']),
- },
- async mounted() {
- await this.$store.dispatch('getUpcomingNum')
- this.tagList[0].num = this.$store.state.upcomingNum.d
- this.tagList[1].num = this.$store.state.upcomingNum.y
- },
- onReady() {
- var that = this
-
- this.$nextTick(() => {
- uni.createSelectorQuery()
- .in(this)
- .select('.content_search')
- .boundingClientRect((rect) => {
- that.height = `calc(100vh - ${rect.height + 150}px)`
- that.top = `${rect.height}px`
- })
- .exec()
- })
- },
- onLoad() {
- uni.getSystemInfo({
- success: res => {
- this.windowHeight = res.windowHeight
- }
- })
- uni.$on('success', () => {
- this.search();
- })
- this.loadData()
- },
- methods: {
- // 鎼滅储
- searchInput(val) {
- this.searchForm.mixParam = val;
- this.search();
- },
- getPageCount() {
- pageCount({mixParam: this.searchForm.mixParam})
- .then(res => {
- this.tagList[0].num = res.data.startNum
- this.tagList[1].num = res.data.endNum
- this.$store.commit('SETNUM', {
- d: res.data.startNum,
- y: res.data.endNum
- })
- })
- .catch(err => {})
- },
- loadData() {
- getList({
- model: this.searchForm,
- ...this.page
- })
- .then(res => {
- let data = res.data
- if (data.page == 1) {
- this.projectList = []
- }
- this.page.page = data.page
- this.page.total = data.total
- this.projectList.push(...data.records)
- })
- .catch(err => {
-
- })
- .finally(() => {
- this.triggered = false
- })
- },
- refresh() {
- if (this.triggered) return
- this.triggered = true;
- this.search()
- // this.page.page = 1
- // this.loadData()
- // this.getPageCount()
- },
- loadMore() {
- this.page.page += 1
- this.loadData()
- },
- clickTag(status) {
- if (this.searchForm.status == status) return
- this.searchForm.status = status
- this.search()
- },
- jump(item) {
- console.log(item.type);
- switch(item.type) {
- case 0: case 2: case 5: {
- if (item.status === 0) {
- uni.navigateTo({
- url: `/pages_inspect/pages/OutOperation/OutOperation?id=${item.objId}&dbid=${item.id}&type=7`
- })
- } else {
- debugger
- uni.navigateTo({
- url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${item.objId}&status=${item.status}&type=${item.type}&dbid=${item.id}`
- })
- }
- break
- }
- case 3: {
- if (item.status==0) {
-
- } else{
- uni.navigateTo({
- url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${item.objId}`
- })
- }
- break
- }
- case 4: {
- break
- }
- case 1: case 6: {
- if (item.status === 0) {
- uni.navigateTo({
- url: `/pages_inspect/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=7`
- })
- } else {
- uni.navigateTo({
- url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${item.objId}`
- })
- }
- break
- }
- case 9: {
- if (item.status === 0) {
- uni.navigateTo({
- url: `/pages_inspect/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=9`
- })
- } else{
- uni.navigateTo({
- url: `/pages_adjust/pages_adjust/pages/warehousingDetails1/warehousingDetails1?id=${item.objId}`
- })
- }
- }
- default: {
-
- }
- }
- /**
- *
- * if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 0) { // 璺宠浆鍑哄簱(杞簱鍗�)
-
- } else if ((item.type === 0 || item.type === 2 || item.type === 5) && item.status === 1) {
-
- } else if ((item.type === 1 || item.type === 4 || item.type === 6) && item.status === 0) { // 璺宠浆鍏ュ簱(杞簱鍗�)
- if (item.type === 4) { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
- // router.push({
- // name: 'completionDetails',
- // query: {
- // id: item.objId,
- // dbid: item.id,
- // type: 7,
- // isShow: 1,
- // Type: item.type
- // }
- // })
- return
- }
- uni.navigateTo({
- url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=7`
- })
-
- } else if ((item.type === 1 || item.type === 4 || item.type === 6) && item.status === 1) {
- if (item.type === 4) { // 璺宠洓瀹屽伐鍏ュ簱璇︽儏
- // router.push({
- // name: 'completionDetails',
- // query: {
- // id: item.objId,
- // dbid: item.id,
- // type: 7,
- // isShow: 2
- // }
- // })
- return
- }
- uni.navigateTo({
- url: `/pages/warehousingDetails/warehousingDetails?id=${item.objId}`
- })
- // router.push({
- // name: 'wTransferDetail',
- // query: {
- // id: item.objId
- // }
- // })
- } else if (item.type === 3 && item.status === 0) { // 纭澶囨枡
- // router.push({
- // name: 'orderStock',
- // query: {
- // id: item.objId,
- // dbid: item.id
- // }
- // })
- } else if (item.type === 3 && item.status === 1) { // 澶囨枡锛堣浆搴撳崟璇︽儏锛�
- uni.navigateTo({
- url: `/pages/warehousingDetails/warehousingDetails?id=${item.objId}`
- })
- // router.push({
- // name: 'wTransferDetail',
- // query: {
- // id: item.objId
- // }
- // })
- } else if (item.type === 9 && item.status === 0) { // 璋冩暣鍏ュ簱(鍏ュ簱鍗�)
- uni.navigateTo({
- url: `/pages/InOperation/InOperation?id=${item.objId}&dbid=${item.id}&type=9`
- })
- // router.push({
- // name: 'warehousing',
- // query: {
- // id: item.objId,
- // dbid: item.id,
- // type: 9
- // }
- // })
- } else if (item.type === 9 && item.status === 1) {
- uni.navigateTo({
- url: `/pages_adjust/pages/warehousingDetails1/warehousingDetails1?id=${item.objId}`
- })
- // router.push({
- // name: 'wInboundDetail',
- // query: {
- // id: item.objId
- // }
- // })
- }
- *
- *
- * */
-
-
- },
- filterAction() {
- this.show = true
- },
- close() {
- this.show = false
- },
- resetType() {
- this.type = ''
- this.searchForm.type = ''
- this.ban =false
- this.confirm()
-
- },
- confirm() {
- this.searchForm.type = this.type
- this.show = false
- this.ban =false
- this.search()
- },
- search() {
- this.page.page = 1
- this.loadData()
- this.getPageCount()
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .index {
- width: 100vw;
- height: 100vh;
- }
-
- .nav-style {
- border-bottom: 20rpx #f7f7f7 solid;
- }
-
- .box_list {
- width: 100%;
- padding: 0 30rpx;
- display: flex;
- flex-direction: column;
- box-sizing: border-box;
-
- .box_list_item {
- padding: 30rpx 0;
- display: flex;
- border-bottom: 1rpx solid #E5E5E5;
-
- &:last-child {
- border: none;
- }
-
- .box_list_item_icon {
- flex-shrink: 0;
- width: 64rpx;
- height: 64rpx;
- margin-right: 24rpx;
- position: relative;
-
- .box_list_item_icon_active {
- position: absolute;
- right: 0;
- top: 0;
- width: 18rpx;
- height: 18rpx;
- border-radius: 50%;
- background: #DE5243;
- border: 2rpx solid #FFFFFF;
- }
-
- image {
- width: 100%;
- height: 100%;
- }
- }
-
- .box_list_item_nr {
- flex: 1;
- display: flex;
- flex-direction: column;
-
- .box_list_item_nr_top {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- span {
- &:first-child {
- font-size: 30rpx;
- font-weight: 500;
- max-width: 450rpx;
- color: #222222;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- -o-text-overflow: ellipsis;
- }
-
- &:last-child {
- flex-shrink: 0;
- font-size: 24rpx;
- font-weight: 400;
- color: #999999;
- margin-left: 10rpx;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- -o-text-overflow: ellipsis;
- }
- }
- }
-
- .box_list_item_nr_bottom {
- font-size: 28rpx;
- font-weight: 400;
- color: #666666;
- margin-top: 16rpx;
- word-break: break-all;
- }
- }
- }
- }
-
- .contanir {
- height: calc(env(safe-area-inset-bottom) + 720rpx);
-
- .content {
- margin-top: 20rpx;
-
- .type-style {
- width: 325rpx;
- margin-bottom: 20rpx;
- }
- }
- }
-
- .bottom-view {
- left: 40rpx;
- right: 40rpx;
- bottom: 40rpx
- }
- .tag_item {
- min-width: 120rpx;
- // padding: 0 24rpx;
- border-radius: 26rpx;
- text-align: center;
- flex-shrink: 0;
- margin-right: 20rpx;
- border: 1rpx solid #CCCCCC;
- font-size: 26rpx;
- font-weight: 400;
- height: 52rpx;
- line-height: 52rpx;
- }
- .content_search_x {
- height: 24rpx;
- }
- .mask {
- z-index: 8000;
- position: fixed;
- left: 0;
- top: 0;
- right: 0;
- bottom: 0;
- height: 100vh;
- background-color: rgba(0, 0, 0, 0.5);
- }
-</style>
diff --git a/minipro_standard/pages/login/login.vue b/minipro_standard/pages/login/login.vue
deleted file mode 100644
index 472429d..0000000
--- a/minipro_standard/pages/login/login.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<template>
- <view class="login-content plr60">
- <view class="login-bg">
- <image src="@/static/login_bg@2x.png" mode="aspectFill" class="bg-img"></image>
- <image src="@/static/logo@2x.png" mode="aspectFill" class="login-log img180"></image>
- <view class="tc title">DM浜戝伐鍘�</view>
- </view>
- <view class="bg_w rd8 ptb30 pl40 bbox com-input flex input-height">
- <image src="@/static/login_ic_code@2x.png" mode="" class="img40 mr25"></image>
- <!-- <input placeholder="浼佷笟浠ｇ爜" border="none" v-model="form.companyId"/> -->
- <u--input placeholder="浼佷笟浠ｇ爜" border="none" v-model="form.companyId"></u--input>
- </view>
- <view class="bg_w rd8 ptb30 pl40 bbox mt40 flex input-height">
- <image src="@/static/login_ic_phone@2x.png" mode="" class="img40 mr25"></image>
- <u--input placeholder="鎵嬫満鍙�" border="none" v-model="form.username"></u--input>
- </view>
- <view class="bg_w rd8 ptb30 pl40 bbox mt40 flex input-height">
- <image src="@/static/login_ic_password@2x.png" mode="" class="img40 mr25"></image>
- <u--input placeholder="瀵嗙爜" border="none" password v-model="form.password"></u--input>
- </view>
- <view class="login-btn mt80" @click="loginAction">绔嬪嵆鐧诲綍</view>
- </view>
-</template>
-
-<script>
- import { wxLogin, wxAccountLogin, getUserInfo, wxProgramLogin } from '@/util/api/index.js';
- export default {
- data() {
- return {
- form: {
- openid: '',
- unionid: '',
- companyId: '',
- username: '',
- password: ''
- }
- };
- },
- onLoad() {
- var that = this
- uni.login({
- provider: 'weixin',
- success: function (loginRes) {
- wxProgramLogin({ code: loginRes.code })
- .then(async (res) => {
- if (res.code === 200) {
- // 鍏嶇櫥褰曪紝鐩存帴璺抽椤�
- if (res.data.loginStatus == 0) {
- that.$store.commit('SETSESSION', res.data.session)
- let info = await getUserInfo()
- if (info.code === 200) {
- await that.$store.commit('setEntrance', 'WX')
- await that.$store.commit('SETUSERINFO', info.data)
- await that.$store.dispatch('getMenuList', 2)
- uni.switchTab({
- url: '/pages/workbench/workbench'
- });
- }
- } else {
- that.form.openid = res.data.openid
- that.form.unionid = res.data.unionid
- }
- }
- })
- }
- });
- },
- methods: {
- async loginAction() {
- if (!this.form.companyId) return uni.showToast({ title: '浼佷笟浠ｇ爜涓嶈兘涓虹┖', icon:"error", duration: 2000 });
- if (!this.form.username) return uni.showToast({ title: '鎵嬫満鍙蜂笉鑳戒负绌�', icon:"error", duration: 2000 });
- if (!this.form.password) return uni.showToast({ title: '瀵嗙爜涓嶈兘涓虹┖', icon:"error", duration: 2000 });
- let res = await wxAccountLogin(this.form)
- if (res.code === 200) {
- await this.$store.commit('SETSESSION', res.data)
- let user = await getUserInfo({})
- if (user.code === 200) {
- await this.$store.commit('SETUSERINFO', user.data)
- await this.$store.dispatch('getMenuList', 2)
- uni.switchTab({
- url: '/pages/workbench/workbench'
- });
- }
- }
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
-.login-content {
- height: 100vh;
- background: #FFFFFF linear-gradient(180deg, rgba(66,117,252,0.2) 0%, rgba(66,117,252,0) 100%);
- .login-bg {
- position: relative;
- height: 812rpx;
- .bg-img {
- position: absolute;
- z-index: 1;
- width: 100%;
- height: 100%;
- }
- .login-log {
- margin: 356rpx auto 0 auto ;
- left: 0;
- right: 0;
- position: absolute;
- }
- .title {
- position: absolute;
- margin-top: 576rpx;
- left: 0;
- width: 100%;
- height: 60rpx;
- font-size: 44rpx;
- font-weight: 600;
- color: #333333;
- line-height: 60rpx;
- }
- }
- .input-height {
- height: 100rpx;
- }
- .com-input {
- margin-top: -60px;
- position: relative;
- z-index: 2;
- }
- .login-btn {
- height: 98rpx;
- background: #4275FC;
- box-shadow: 0rpx 12rpx 24rpx 0rpx rgba(66,117,252,0.2);
- border-radius: 8rpx;
- text-align: center;
- font-size: 32rpx;
- font-weight: 500;
- color: #FFFFFF;
- line-height: 98rpx;
- }
-}
-</style>
diff --git a/minipro_standard/pages/mine/mine.vue b/minipro_standard/pages/mine/mine.vue
deleted file mode 100644
index 6ea8277..0000000
--- a/minipro_standard/pages/mine/mine.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template>
-<view>
- <div class="box">
- <!-- :style="{background: 'url(' + img + ')'}" -->
- <div class="box_info">
- <image :src="avatar" mode="widthFix" />
- <div class="box_info_box">
- <text>{{userInfo.realname}}</text>
- <div class="box_info_box_x" @click="switchOrganization">
- <text>{{userInfo.curComDepartment ? userInfo.curComDepartment.name : ''}}</text>
- <image src="@/static/mine_ic_change@2x.png" alt="" />
- </div>
- </div>
- <image class="bg" src="@/static/mine_bg@2x.png" mode="widthFix"></image>
- </div>
- <div class="box_function">
- <div class="box_function_item" v-for="(item, index) in MENU" :key="index" @click="jump(item.url)">
- <div class="box_function_item_left">
- <image :src="item.icon" alt="" />
- <text>{{item.name}}</text>
- </div>
- <div class="box_function_item_right">
- <van-icon name="arrow" size="20" color="#CCCCCC" />
- </div>
- </div>
- </div>
- <div class="box_out" @click="loginOut"><text>閫�鍑虹櫥褰�</text></div>
- </div>
- <!-- 閮ㄩ棬閫夋嫨鍣� -->
- <u-picker :show="show" :columns="columns" @confirm="onConfirm" @cancel="show = false"></u-picker>
- <myTabbar :index="2" />
-</view>
-</template>
-
-<script>
- import { changeCom, getDepartmentListByConditon } from '@/util/api/PersonalAPI'
- import myTabbar from "@/components/myTabber.vue"
- import { wxLoginOut } from '@/util/api'
- import { mapState } from 'vuex'
- export default {
- components: {
- myTabbar
- },
- computed: mapState([
- 'userInfo'
- ]),
- data() {
- return {
- MENU: [
- { name: '涓汉淇℃伅', url: '/pages/personal/personal', icon: require('@/static/mine_ic_gerenxinxi@2x.png') },
- // { name: '绯荤粺閫氱煡', url: '', icon: require('@/assets/icon/mine_ic_xitonggonggao@2x.png') },
- { name: '鏇存柊鎵嬫満鍙�', url: '/pages/updatePhone/updatePhone', icon: require('@/static/mine_ic_shoujihao@2x.png') },
- { name: '鏇存柊閭鍙�', url: '/pages/updateMailbox/updateMailbox', icon: require('@/static/mine_ic_youxianghao@2x.png') },
- { name: '鎵爜缁戝畾璐﹀彿', url: '', icon: require('@/static/mine_ic_bangding@2x.png') },
- { name: '淇敼瀵嗙爜', url: '/pages/changePassword/changePassword', icon: require('@/static/mine_ic_xiugaimima@2x.png') },
- ],
- img: require('@/static/mine_bg@2x.png'),
- avatar: require('@/static/2@2x.png'),
- show: false,
- columns: []
- }
- },
- onLoad() {
- uni.hideTabBar()
- },
- methods: {
- // 閫�鍑虹櫥褰�
- loginOut() {
- wxLoginOut({
- companyUserId: this.userInfo.companyUser.id
- }).then(res => {
- if (res.code === 200) {
- this.$store.commit('clearCache')
- uni.reLaunch({
- url: '/pages/login/login'
- });
- }
- })
- },
- // 纭鍒囨崲缁勭粐
- onConfirm(e) {
- changeCom(e.value[0].id).then(res => {
- if (res.code === 200) {
- this.show = false
- uni.showToast({ title: '鏇存柊缁勭粐鎴愬姛', icon: 'success', duration: 2000 });
- this.$store.dispatch('getUserInfos')
- }
- })
- },
- // 鑾峰彇缁勭粐
- switchOrganization() {
- getDepartmentListByConditon({
- type: 0
- }).then(res => {
- if (res.code === 200) {
- this.columns = []
- let arr = []
- res.data.forEach((item) => {
- let obj = {
- text: item.name, id: item.id
- }
- arr.push(obj)
- })
- this.columns.push(arr)
- this.show = true
- }
- })
- },
- // 璺宠浆椤甸潰
- jump(url) {
- if (!url) return
- uni.navigateTo({ url })
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .box {
- width: 100%;
- padding: 30rpx;
- box-sizing: border-box;
- .box_info {
- padding: 0 30rpx;
- height: 168rpx;
- border-radius: 16rpx;
- display: flex;
- align-items: center;
- background-repeat: no-repeat;
- background-size: cover;
- position: relative;
- image {
- width: 88rpx;
- height: 88rpx;
- }
- .bg {
- width: 100%;
- height: 168rpx;
- position: absolute;
- top: 0;
- left: 0;
- z-index: -1;
- }
- .box_info_box {
- height: 88rpx;
- display: flex;
- margin-left: 30rpx;
- flex-direction: column;
- justify-content: space-between;
- .box_info_box_x {
- display: flex;
- align-items: center;
- text {
- font-size: 26rpx;
- font-weight: 400;
- color: rgba(255, 255, 255, 0.8);
- }
- image {
- width: 26rpx;
- height: 26rpx;
- margin-left: 10rpx;
- }
- }
- text {
- font-size: 34rpx;
- font-weight: 500;
- color: #FFFFFF;
- }
- }
- }
- .box_function {
- margin-top: 30rpx;
- .box_function_item {
- display: flex;
- align-items: center;
- justify-content: space-between;
- height: 98rpx;
- border-bottom: 1rpx solid #E5E5E5;
- /*&:last-child {*/
- /* border: none;*/
- /*}*/
- .box_function_item_left {
- display: flex;
- align-items: center;
- image {
- width: 36rpx;
- height: 36rpx;
- margin-right: 24rpx;
- }
- text {
- font-size: 30rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- }
- }
- .box_out {
- position: fixed;
- bottom: 200rpx;
- left: 50%;
- transform: translate(-50%, 0);
- width: 350rpx;
- height: 88rpx;
- background: #F7F7F7;
- border-radius: 44rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 30rpx;
- font-weight: 400;
- color: #333333;
- }
- }
-</style>
diff --git a/minipro_standard/pages/personal/personal.vue b/minipro_standard/pages/personal/personal.vue
deleted file mode 100644
index 7bc7077..0000000
--- a/minipro_standard/pages/personal/personal.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
- <view class="info">
- <view class="info_portrait">
- <image :src="userInfo.avatar ? userInfo.avatar : avatar" mode="widthFix" />
- <text>{{userInfo.companyUser ? userInfo.companyUser.name : ''}}</text>
- </view>
- <view class="info_list">
- <view class="info_list_item">
- <text>鏄电О</text>
- <text>{{userInfo.realname ? userInfo.realname : '鏆傛棤鏄电О'}}</text>
- </view>
- <view class="info_list_item">
- <text>鎵嬫満鍙�</text>
- <text>{{userInfo.companyUser.phone ? userInfo.companyUser.phone : '鏆傛棤鎵嬫満鍙�'}}</text>
- </view>
- <view class="info_list_item">
- <text>鎵�灞為儴闂�</text>
- <text>{{userInfo.department.name ? userInfo.department.name : '鏆傛棤鎵�灞為儴闂�'}}</text>
- </view>
- <view class="info_list_item">
- <text>宀椾綅</text>
- <text>{{userInfo.companyUser.positionName ? userInfo.companyUser.positionName : '鏆傛棤宀椾綅'}}</text>
- </view>
- <view class="info_list_item">
- <text>褰撳墠缁勭粐</text>
- <text>{{userInfo.rootDepartment.name ? userInfo.rootDepartment.name : '鏆傛棤缁勭粐'}}</text>
- </view>
- </view>
- </view>
-</template>
-
-<script>
- import { mapState } from 'vuex'
- export default {
- data() {
- return {
- avatar: require('@/static/2@2x.png'),
- };
- },
- computed: mapState([
- 'userInfo'
- ])
- }
-</script>
-
-<style lang="scss" scoped>
-.info {
- padding: 30rpx;
- position: absolute;
- width: 100%;
- height: 100%;
- box-sizing: border-box;
- background: white;
- .info_portrait {
- display: flex;
- align-items: center;
- flex-direction: column;
- margin-top: 60rpx;
- image {
- width: 140rpx;
- height: 140rpx;
- margin-bottom: 30rpx;
- }
- text {
- font-size: 30rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- .info_list {
- margin-top: 30rpx;
- .info_list_item {
- height: 98rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
- text {
- &:first-child {
- font-size: 30rpx;
- font-weight: 400;
- color: #777777;
- }
- &:last-child {
- font-size: 28rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- }
- }
-}
-</style>
diff --git a/minipro_standard/pages/plannedDistribution/plannedDistribution.vue b/minipro_standard/pages/plannedDistribution/plannedDistribution.vue
deleted file mode 100644
index 6266952..0000000
--- a/minipro_standard/pages/plannedDistribution/plannedDistribution.vue
+++ /dev/null
@@ -1,451 +0,0 @@
-<template>
- <view class="content">
- <view class="content_search">
- <Search @searchInput="searchInput" placeholder="鎼滅储鐗╂枡鍚嶇О/缂栫爜"></Search>
- <view class="content_search_x" v-if="tagList.length > 0"></view>
- <LabelSelection :TagList="tagList" :isShow="true" @change="clickTag" />
- </view>
- <view class="content_total" :style="{top: top}">鍏眥{search.total}}鏉℃暟鎹�</view>
- <view class="content_list">
- <scroll-view
- :refresher-enabled="true"
- :refresher-triggered="isLoading"
- @refresherrefresh="onRefresh"
- refresher-background="#fff"
- @scrolltolower="getLists"
- scroll-y
- :style="{height: height}">
- <view class="fp_list_item" v-for="(item, i) in list" :key="item.id" @click="clickItem(i)">
- <view class="fp_list_item_header">
- <view class="fp_list_item_header_xz">
- <u-checkbox-group>
- <u-checkbox :checked="item.isActive"></u-checkbox>
- </u-checkbox-group>
- <view class="fp_list_item_header_xz_f"></view>
- </view>
- <text v-if="item.mmodel">{{item.mmodel.name}}</text>
- <view class="tags" v-if="item.urgent">浼樺厛{{item.urgent}}</view>
- <view class="warning" v-if="item.type === 2">杩斿伐</view>
- <view class="warning success" v-else-if="item.type === 0">姝ｅ父</view>
- <view class="warning fail" v-else-if="item.type === 1">寮傚父</view>
- </view>
- <view class="fp_list_item_nr">
- <view class="item" v-if="item.pmodel">
- <view class="item_label">宸ュ簭鍚嶇О锛�</view>
- <view class="item_nr">{{item.pmodel.name}}</view>
- </view>
- <view class="item">
- <view class="item_label">璁″垝鏃ユ湡锛�</view>
- <view class="item_nr">{{item.planDate}}</view>
- </view>
- <view class="item">
- <view class="item_label">璁″垝鏁伴噺锛�</view>
- <view class="item_nr">{{item.num}}</view>
- </view>
- <view class="item">
- <view class="item_label">鐢熶骇鎵规锛�</view>
- <view class="item_nr">{{item.batch}}</view>
- </view>
- <view class="item">
- <view class="item_label">搴撳瓨锛�</view>
- <view class="item_nr">{{item.isStock === 0 ? '涓嶆弧瓒�' : '婊¤冻'}}</view>
- </view>
- </view>
- </view>
- </scroll-view>
- </view>
- <view class="fp_zw"></view>
- <view class="fp_footer">
- <view class="fp_footer_button" @click="submit">鍒嗛厤</view>
- </view>
- </view>
-</template>
-
-<script>
- import Search from '@/components/Search.vue'
- import LabelSelection from '@/components/LabelSelection.vue'
- import { getList, getSelfList } from '@/util/api/PlanningAPI'
- export default {
- components: { Search, LabelSelection },
- data() {
- return {
- height: '',
- top: '',
- isLoading: false,
- search: {
- gxId: '',
- capacity: 10,
- page: 0,
- total: 0,
- mixParam: '',
- first: true // 鐢ㄤ簬鍒ゆ柇鏄惁鏄涓�娆¤繘鍏ラ〉闈�
- },
- tagList: [],
- finished: false,
- loading: false,
- refreshing: false,
- list: []
- };
- },
- onReady() {
- var that = this
- this.$nextTick(() => {
- uni.createSelectorQuery().in(this).select('.content_search').boundingClientRect((rect) => {
- that.height = `calc(100vh - ${rect.height + 80}px)`
- that.top = `${rect.height}px`
- }).exec()
- })
- },
- onLoad() {
- this.getLists()
- uni.$on('update', (data) => {
- this.isLoading = true
- this.search.page = 0
- this.list = []
- this.finished = false
- this.getLists()
- })
- },
- methods: {
- // 涓嬫媺鍒锋柊
- onRefresh() {
- if (this.isLoading) return
- this.isLoading = true
- this.search.page = 0
- this.list = []
- this.finished = false
- this.getLists()
- },
- // 鐐瑰嚮褰撳墠椤�
- clickItem(i) {
- this.list.forEach((item, index) => {
- if (i === index) {
- item.isActive = !item.isActive
- } else {
- item.isActive = false
- }
- })
- },
- // 鎼滅储
- searchInput(e) {
- this.search.mixParam = e
- this.search.page = 0
- this.list = []
- this.finished = false
- this.getLists()
- },
- // 鐐瑰嚮
- clickTag(id) {
- this.search.gxId = id
- this.list = []
- this.search.page = 0
- this.finished = false
- this.getLists()
- },
- // 鍒嗛厤
- submit() {
- let data;
- this.list.forEach((item) => {
- if (item.isActive) {
- data = item
- }
- })
- if (!data) {
- uni.showToast({ title: '鑷冲皯閫夋嫨涓�椤硅鍒掞紒', icon: 'none', duration: 2000 });
- return
- }
- uni.navigateTo({
- url: `/pages/allocation/allocation?gxid=${data.procedureId}&jhid=${data.id}&num=${data.num - data.workorderDistributNum - data.distributNoDoneNum}`
- });
- },
- // 鑾峰彇褰撳墠鐢ㄦ埛鎵�鍒嗛厤鐨勫伐搴�
- async getWorkingProcedures() {
- let res = await getSelfList({})
- if (res.code === 200 && res.data.length > 0) {
- let arr = []
- res.data.forEach((item) => {
- arr.push({ name: item.name, id: item.id })
- })
- this.search.gxId = arr[0].id
- this.tagList = arr
- return true
- }
- return false
- },
- // 鑾峰彇璁″垝鍒楄〃鏁版嵁
- async getLists() {
- if (!this.finished) {
- this.loading = true
- this.search.page = this.search.page += 1
- if (this.search.first) { // 濡傛灉鏄涓�娆★紝鍏堣姹傚伐搴�
- await this.getWorkingProcedures()
- let res = await getList({
- capacity: this.search.capacity,
- page: this.search.page,
- model: {
- mixParam: this.search.mixParam,
- procedureId: this.search.gxId,
- statusList: [1, 4]
- }
- })
- this.isLoading = false
- this.loading = false
- if (this.refreshing) {
- this.list = []
- this.refreshing = false;
- }
- if (res.code === 200 && res.data.records.length !== 0) {
- this.search.total = res.data.total
- res.data.records.forEach((item) => {
- item.isActive = false
- })
- this.list.push(...res.data.records)
- } else {
- this.finished = true;
- }
- this.search.first = false
- } else {
- let res = await getList({
- capacity: this.search.capacity,
- page: this.search.page,
- model: {
- mixParam: this.search.mixParam,
- procedureId: this.search.gxId,
- statusList: [1, 4]
- }
- })
- this.isLoading = false
- if (this.refreshing) {
- this.list = []
- this.refreshing = false;
- }
- this.loading = false
- if (res.code === 200 && res.data.records.length !== 0) {
- res.data.records.forEach((item) => {
- item.isActive = false
- })
- this.list.push(...res.data.records)
- this.search.total = res.data.total
- } else {
- this.finished = true;
- }
- }
- }
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .content {
- .content_search {
- width: 100%;
- padding: 30rpx;
- background: white;
- position: sticky;
- top: 0;
- z-index: 999;
- box-sizing: border-box;
- .Search_item {
- margin-bottom: 40rpx;
- .Search_item_label {
- font-size: 30rpx;
- font-weight: 500;
- color: #222222;
- }
- .Search_item_content {
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-top: 30rpx;
- .tag {
- display: flex;
- flex-wrap: wrap;
- align-items: center;
- .tag_active {
- background: $nav-color !important;
- color: #ffffff !important;
- }
- .tag_item {
- padding: 22rpx 26rpx;
- box-sizing: border-box;
- background: #F2F2F2;
- border-radius: 8rpx;
- font-size: 26rpx;
- font-weight: 400;
- color: #333333;
- display: flex;
- align-items: center;
- justify-content: center;
- margin-right: 22rpx;
- margin-bottom: 22rpx;
- }
- }
- text {
- font-size: 26rpx;
- font-weight: 400;
- color: #333333;
- margin: 0 30rpx;
- }
- .Search_item_content_a {
- padding: 20rpx 0;
- flex: 1;
- background: #F7F7F7;
- border-radius: 8rpx;
- border: 1rpx solid #EEEEEE;
- font-size: 26rpx;
- font-weight: 400;
- color: #B2B2B2;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- }
- .content_search_x {
- height: 24rpx;
- }
- }
- .content_list {
- width: 100%;
- display: flex;
- flex-direction: column;
- .fp_list_item {
- background: white;
- display: flex;
- flex-direction: column;
- padding: 30rpx;
- border-bottom: 1rpx solid #ececec;
- .fp_list_item_header {
- display: flex;
- align-items: center;
- .fp_list_item_header_xz {
- width: 40rpx;
- height: 40rpx;
- position: relative;
- .fp_list_item_header_xz_f {
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- z-index: 99;
- }
- }
- text {
- max-width: 64%;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- -o-text-overflow: ellipsis;
- font-size: 32rpx;
- font-weight: 500;
- color: #333333;
- margin-left: 14rpx;
- }
- .tags {
- flex-shrink: 0;
- margin-left: 16rpx;
- padding: 5rpx 10rpx;
- background: $nav-stateColor4;
- border-radius: 8rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 22rpx;
- font-weight: 400;
- color: #FFFFFF;
- }
- .fail {
- background: $nav-stateColor4 !important;
- }
- .success {
- background: $nav-stateColor2 !important;
- }
- .warning {
- flex-shrink: 0;
- margin-left: 16rpx;
- padding: 5rpx 10rpx;
- background: $nav-stateColor5;
- border-radius: 8rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 22rpx;
- font-weight: 400;
- color: #FFFFFF;
- }
- }
- .fp_list_item_nr {
- padding: 24rpx 30rpx;
- background: #F7F7F7;
- border-radius: 16rpx;
- margin-top: 32rpx;
- display: flex;
- align-items: flex-start;
- flex-wrap: wrap;
- .item {
- display: flex;
- align-items: flex-start;
- width: 50%;
- margin-top: 24rpx;
- &:nth-child(1) {
- margin-top: 0!important;
- }
- &:nth-child(2) {
- margin-top: 0!important;
- }
- .item_label {
- width: 130rpx;
- flex-shrink: 0;
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- text-align: right;
- }
- .item_nr {
- font-size: 24rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- }
- }
- }
- .content_total {
- width: 100%;
- height: 80rpx;
- padding: 24rpx 30rpx;
- background: #F7F7F7;
- font-size: 24rpx;
- font-weight: 400;
- box-sizing: border-box;
- color: #666666;
- position: sticky;
- z-index: 99;
- }
- .fp_zw {
- height: calc(98rpx + env(safe-area-inset-bottom));
- }
- .fp_footer {
- width: 100%;
- padding-bottom: env(safe-area-inset-bottom);
- position: fixed;
- bottom: 0;
- left: 0;
- background: #ffffff;
- .fp_footer_button {
- width: 272rpx;
- height: 98rpx;
- background: $nav-color;
- font-size: 32rpx;
- font-weight: 500;
- color: #FFFFFF;
- display: flex;
- align-items: center;
- justify-content: center;
- float: right;
- }
- }
- }
-</style>
diff --git a/minipro_standard/pages/plannedProgress/plannedProgress.vue b/minipro_standard/pages/plannedProgress/plannedProgress.vue
deleted file mode 100644
index fe0ae90..0000000
--- a/minipro_standard/pages/plannedProgress/plannedProgress.vue
+++ /dev/null
@@ -1,560 +0,0 @@
-<template>
- <view class="content">
- <view class="content_search">
- <Search @searchInput="searchInput" @submit="submit" @reset="reset" :isShow="true" placeholder="鎼滅储鐗╂枡鍚嶇О/缂栫爜/宸ュ簭鍚嶇О">
- <template v-slot:content>
- <view class="Search_item">
- <view class="Search_item_label">璁″垝鏃ユ湡</view>
- <view class="Search_item_content" @click="openDate">
- <view class="Search_item_content_a" :style="listData.startDate ? 'color: #000' : ''">{{ listData.startDate ? listData.startDate : '寮�濮嬫棩鏈�'}}</view>
- <text>-</text>
- <view class="Search_item_content_a" :style="listData.endDate ? 'color: #000' : ''">{{ listData.endDate ? listData.endDate : '缁撴潫鏃ユ湡'}}</view>
- </view>
- </view>
- <view class="Search_item">
- <view class="Search_item_label">鐢熶骇宸ュ巶</view>
- <view class="Search_item_content">
- <view class="tag">
- <view class="tag_item" :class="{'tag_active': item.isActive}" v-for="(item, i) in factoryList" :key="item.id" @click="changeTags(i, item.id)">{{item.name}}</view>
- </view>
- </view>
- </view>
- <view class="Search_item">
- <view class="Search_item_label">宸ュ簭</view>
- <view class="Search_item_content">
- <view class="tag">
- <view class="tag_item" :class="{'tag_active': item.isActive}" v-for="(item, i) in data" :key="item.id" @click="changeTag(i)">{{item.name}}</view>
- </view>
- </view>
- </view>
- </template>
- </Search>
- <view class="content_search_x"></view>
- <LabelSelection :TagList="tagList" :isShow="true" @change="clickTag" />
- </view>
- <view class="content_total" :style="{top: top}">鍏眥{listData.total}}鏉℃暟鎹�</view>
- <view class="content_list">
- <scroll-view
- :refresher-enabled="true"
- :refresher-triggered="isLoading"
- @refresherrefresh="onRefresh"
- refresher-background="#fff"
- @scrolltolower="getLists"
- scroll-y
- :style="{height: height}">
- <view class="content_list_item" v-for="item in lists" :key="item.id" @click="jump(item)">
- <view class="content_list_item_top">
- <view class="content_list_item_top_left">
- <text v-if="item.mmodel">{{item.mmodel.name}}</text>
- <view class="content_list_item_top_left_tag" v-if="item.urgent">浼樺厛{{item.urgent}}</view>
- <view class="content_list_item_top_left_tag warning" v-if="item.paused === 1">鍋�</view>
- </view>
- <view class="content_list_item_top_right">
- <text v-if="item.status === 0">宸茬敓鎴�</text>
- <text v-if="item.status === 1">宸插彂甯�</text>
- <text v-if="item.status === 2">宸叉挙鍥�</text>
- <text v-if="item.status === 3">宸插彇娑�</text>
- <text v-if="item.status === 4">宸插垎閰�</text>
- <text v-if="item.status === 5">宸叉殏鍋�</text>
- <text v-if="item.status === 6">宸插畬宸�</text>
- <text v-if="item.status === 7">宸插叆搴�</text>
- <text v-if="item.status === 8">宸插叧闂�</text>
-<!-- <text class="warning" v-if="item.status === 0">寰呭彂甯�</text>-->
-<!-- <text class="green" v-else-if="item.status === 1 || item.status === 4">鐢熶骇涓�</text>-->
-<!-- <text class="info" v-else-if="item.status === 6 || item.status === 7 || item.status === 3 || item.status === 8">宸插畬鎴�</text>-->
- </view>
- </view>
- <view class="content_list_item_content">
- <view class="content_list_item_content_item" v-if="item.pmodel">
- <view class="content_list_item_content_item_label">宸ュ簭鍚嶇О锛�</view>
- <view class="content_list_item_content_item_nr">{{item.pmodel.name}}</view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">璁″垝鏃ユ湡锛�</view>
- <view class="content_list_item_content_item_nr">{{item.planDate}}</view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鐗╂枡缂栫爜锛�</view>
- <view class="content_list_item_content_item_nr" v-if="item.mmodel">{{item.mmodel.code}}</view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">璁″垝鏁伴噺锛�</view>
- <view class="content_list_item_content_item_nr" v-if="item.umodel">{{item.num}}{{item.umodel.name}}</view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鐢熶骇鎵规锛�</view>
- <view class="content_list_item_content_item_nr">{{item.batch}}</view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鍙戝竷鏃ユ湡锛�</view>
- <view class="content_list_item_content_item_nr">{{item.publishDate ? item.publishDate : '-'}}</view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">璁″垝浜哄憳锛�</view>
- <view class="content_list_item_content_item_nr">{{item.usermodel.realname}}</view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鐢熶骇宸ュ巶锛�</view>
- <view class="content_list_item_content_item_nr">{{item.fmodel.name}}</view>
- </view>
- </view>
- </view>
- </scroll-view>
- </view>
- <!-- 閫夋嫨鏃ユ湡 -->
- <!-- <u-calendar :show="timeShow" mode="range" @confirm="timeConfirm" @close="timeShow = false"></u-calendar> -->
- <l-calendar :lunar="false" v-model="timeShow" @change="timeConfirm" :isRange="true" activeBgColor="#305ED5"
- rangeColor="#305ED5" rangeBgColor="rgba(48, 80, 213, 0.1)"></l-calendar>
- </view>
-</template>
-
-<script>
- import Search from '@/components/Search.vue'
- import LabelSelection from '@/components/LabelSelection.vue'
- import { getList, pageCount } from '@/util/api/PlanningAPI'
- import { getWorkingProcedure, getOrganization } from '@/util/api'
- import { gsdate } from '@/util/utils.js'
- export default {
- components: { Search, LabelSelection },
- data() {
- return {
- height: '',
- top: '',
- listData: {
- capacity: 10,
- page: 0,
- total: 0,
- startDate: '',
- endDate: '',
- procedureIds: [],
- departIds: '',
- mixParam: '',
- cateIds: null
- },
- tagList: [
- {
- id: '',
- name: '鍏ㄩ儴',
- num: '0'
- },
- {
- id: '0',
- name: '寰呭彂甯�',
- num: '0'
- },
- {
- id: '1,4',
- name: '鐢熶骇涓�',
- num: '0'
- },
- {
- id: '6, 7, 3, 8',
- name: '宸插畬鎴�',
- num: '0'
- }
- ],
- data: [], // 宸ュ簭鏁版嵁
- factoryList: [], // 宸ュ巶
- finished: true,
- loading: false,
- refreshing: false,
- timeShow: false,
- lists: [],
- isLoading: false
- };
- },
- onReady() {
- var that = this
- this.$nextTick(() => {
- uni.createSelectorQuery().in(this).select('.content_search').boundingClientRect((rect) => {
- that.height = `calc(100vh - ${rect.height + 80}px)`
- that.top = `${rect.height}px`
- }).exec()
- })
- },
- onLoad() {
- this.getLists()
- this.getOrganizations()
- },
- methods: {
- // 鍒囨崲宸ュ簭
- changeTag(i) {
- this.data[i].isActive = !this.data[i].isActive
- },
- // 璺宠浆
- jump(item) {
- uni.navigateTo({
- url: `/pages/planDetails/planDetails?id=${item.id}`
- })
- },
- // 鑾峰彇澶撮儴缁勪欢楂樺害
- getHeight(height) {
- this.height = height
- },
- // 涓嬫媺鍒锋柊
- async onRefresh() {
- if (this.isLoading) return;
- this.isLoading = true;
- this.finished = false;
- this.loading = false;
- this.refreshing = false;
- this.getLists();
- // await this.pageCounts()
- },
- // 閲嶇疆
- reset() {
- this.listData.page = 0
- this.finished = false
- this.lists = []
- this.listData.mixParam = ''
- this.listData.startDate = ''
- this.listData.endDate = ''
- this.listData.procedureIds = []
- if (this.factoryList.length > 0) {
- this.listData.departIds = this.factoryList[0].id
- }
- if (this.data.length > 0) {
- this.data.forEach(item => { item.isActive = false })
- }
- this.getLists()
- this.pageCounts()
- },
- // 鏃ユ湡纭畾
- timeConfirm(val) {
- this.listData.startDate = val.startDate
- this.listData.endDate = val.endDate
- this.timeShow = false
- },
- // 鍒囨崲宸ュ巶
- changeTags(i, id) {
- this.listData.departIds = id
- this.getWorkingProcedures(id)
- this.factoryList.forEach((item, index) => {
- if (index === i) {
- item.isActive = true
- } else {
- item.isActive = false
- }
- })
- },
- // 鎵撳紑鏃ユ湡鎻掍欢
- openDate() {
- this.timeShow = true
- },
- // 鎼滅储
- searchInput(val) {
- this.listData.mixParam = val
- this.listData.page = 0
- this.finished = false
- this.lists = []
- this.getLists()
- },
- // 鐐瑰嚮鏍囩鎼滅储
- clickTag(ids) {
- // ids ? ids.split(',') : []
- this.listData.cateIds = ids ? ids.split(',') : []
- this.listData.page = 0
- this.finished = false
- this.lists = []
- this.getLists()
- },
- // 鑾峰彇鍒楄〃缁熻
- pageCounts() {
- pageCount({
- factoryId: this.listData.departIds,
- procedureIdList: this.listData.procedureIds ? this.listData.procedureIds : [],
- startDate: this.listData.startDate,
- endDate: this.listData.endDate,
- // statusList: this.listData.cateIds
- }).then(res => {
- if (res.code === 200 && res.data) {
- this.tagList[0].num = res.data.allNum.toString()
- this.tagList[1].num = res.data.startNum.toString()
- this.tagList[2].num = res.data.ingNum.toString()
- this.tagList[3].num = res.data.endNum.toString()
- }
- })
- },
- // 鑾峰彇宸ュ巶鏁版嵁
- getOrganizations() {
- getOrganization({
- type: 1
- }).then(res => {
- if (res.code === 200 && res.data && res.data.length !== 0) {
- res.data.forEach((item, i) => {
- item.isActive = i === 0;
- })
- if (res.data.length > 0) {
- this.factoryList = res.data
- this.listData.departIds = this.factoryList[0].id
- this.listData.procedureIds = ''
- this.finished = false
- this.getWorkingProcedures(this.factoryList[0].id)
- this.getLists()
- this.pageCounts()
- }
- }
- })
- },
- // 鑾峰彇宸ュ簭鏁版嵁
- getWorkingProcedures(orgId) {
- this.data = []
- getWorkingProcedure({ orgId })
- .then(res => {
- if (res.code === 200 && res.data && res.data.length !== 0) {
- res.data.forEach((item, i) => {
- item.isActive = false;
- })
- this.data = res.data
- }
- })
- },
- // 鎼滅储寮规鎻愪氦
- submit() {
- let pmodelOrgId = []
- this.data.forEach((item) => {
- if (item.isActive) {
- pmodelOrgId.push(item.id)
- }
- })
- this.listData.procedureIds = pmodelOrgId
- this.listData.page = 0
- this.finished = false
- this.lists = []
- this.getLists()
- this.pageCounts()
- },
- // 鑾峰彇璁″垝鍒楄〃鏁版嵁
- getLists() {
- if (!this.finished) {
- this.loading = true
- this.listData.page = this.listData.page += 1
- getList({
- capacity: this.listData.capacity,
- model: {
- mixParam: this.listData.mixParam,
- planDateStartDate: this.listData.startDate,
- planDateEndDate: this.listData.endDate,
- procedureIdList: this.listData.procedureIds ? this.listData.procedureIds : [],
- factoryId: this.listData.departIds,
- statusList: this.listData.cateIds
- // this.listData.cateIds ? this.listData.cateIds.split(',') : []
- },
- page: this.listData.page,
- sorts: [
- {
- direction: 'ASC',
- property: 'publishDate'
- }
- ]
- }).then(res => {
- this.loading = false
- this.isLoading = false;
- this.listData.total = res.data.total
- if (this.refreshing) {
- this.lists = []
- this.refreshing = false;
- }
- if (res.code === 200 && res.data.records.length !== 0) {
- if (this.lists.length === 0) {
- this.lists = res.data.records
- } else {
- this.lists.push(...res.data.records)
- }
- } else {
- this.finished = true
- }
- }).catch(err => {
- this.loading = false
- this.finished = true
- this.isLoading = false;
- if (this.refreshing) {
- this.lists = []
- this.refreshing = false;
- }
- })
- }
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .content {
- .content_search {
- width: 100%;
- padding: 30rpx;
- background: white;
- position: sticky;
- top: 0;
- z-index: 999;
- box-sizing: border-box;
- .Search_item {
- margin-bottom: 40rpx;
- .Search_item_label {
- font-size: 30rpx;
- font-weight: 500;
- color: #222222;
- }
- .Search_item_content {
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-top: 30rpx;
- .tag {
- display: flex;
- flex-wrap: wrap;
- align-items: center;
- .tag_active {
- background: $nav-color !important;
- color: #ffffff !important;
- }
- .tag_item {
- padding: 22rpx 26rpx;
- box-sizing: border-box;
- background: #F2F2F2;
- border-radius: 8rpx;
- font-size: 26rpx;
- font-weight: 400;
- color: #333333;
- display: flex;
- align-items: center;
- justify-content: center;
- margin-right: 22rpx;
- margin-bottom: 22rpx;
- }
- }
- text {
- font-size: 26rpx;
- font-weight: 400;
- color: #333333;
- margin: 0 30rpx;
- }
- .Search_item_content_a {
- padding: 20rpx 0;
- flex: 1;
- background: #F7F7F7;
- border-radius: 8rpx;
- border: 1rpx solid #EEEEEE;
- font-size: 26rpx;
- font-weight: 400;
- color: #B2B2B2;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- }
- .content_search_x {
- height: 24rpx;
- }
- }
- .content_list {
- width: 100%;
- display: flex;
- flex-direction: column;
- .content_list_item {
- width: 100%;
- background: white;
- padding: 30rpx;
- box-sizing: border-box;
- display: flex;
- flex-direction: column;
- border-bottom: 1rpx solid #ececec;
- .content_list_item_top {
- display: flex;
- align-items: center;
- justify-content: space-between;
- .content_list_item_top_left {
- display: flex;
- align-items: center;
- width: 80%;
- text {
- font-size: 32rpx;
- font-weight: 500;
- color: #333333;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
- }
- .warning {
- background: $nav-stateColor5 !important;
- }
- .content_list_item_top_left_tag {
- flex-shrink: 0;
- padding: 5rpx 10rpx;
- background: $nav-stateColor4;
- border-radius: 8rpx;
- font-size: 22rpx;
- font-weight: 400;
- color: #FFFFFF;
- margin-left: 16rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- .content_list_item_top_right {
- font-size: 26rpx;
- font-weight: 400;
- flex-shrink: 0;
- margin-left: 10rpx;
- .warning {
- color: $nav-stateColor5 !important;
- }
- .green {
- color: $nav-stateColor6 !important;
- }
- .info {
- color: $nav-stateColor3 !important;
- }
- }
- }
- .content_list_item_content {
- padding: 24rpx 30rpx;
- background: #F7F7F7;
- border-radius: 16rpx;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- margin-top: 32rpx;
- .content_list_item_content_item {
- width: 50%;
- display: flex;
- margin-top: 24rpx;
- &:nth-child(1) {
- margin-top: 0 !important;
- }
- &:nth-child(2) {
- margin-top: 0 !important;
- }
- .content_list_item_content_item_label {
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
- .content_list_item_content_item_nr {
- font-size: 24rpx;
- font-weight: 400;
- color: #222222;
- margin-right: 10rpx;
- }
- }
- }
- }
- }
- .content_total {
- width: 100%;
- height: 80rpx;
- padding: 24rpx 30rpx;
- background: #F7F7F7;
- font-size: 24rpx;
- font-weight: 400;
- box-sizing: border-box;
- color: #666666;
- position: sticky;
- z-index: 99;
- }
- }
-</style>
diff --git a/minipro_standard/pages/selectWorkOrder/selectWorkOrder.vue b/minipro_standard/pages/selectWorkOrder/selectWorkOrder.vue
deleted file mode 100644
index f220884..0000000
--- a/minipro_standard/pages/selectWorkOrder/selectWorkOrder.vue
+++ /dev/null
@@ -1,484 +0,0 @@
-<template>
- <view class="content">
- <div :class="{ 'content_top': status }" class="content_search">
- <v-Search @searchInput="searchInput" @submit="submit" @reset="reset" :isShow="true"
- placeholder="鎼滅储宸ュ崟缂栫爜/宸ュ簭鍚嶇О">
- <template v-slot:content>
- <div class="Search_item">
- <div class="Search_item_label">璁″垝鏃ユ湡</div>
- <div class="Search_item_content" @click="isOpenDate=true">
- <div class="Search_item_content_a" :style="form.startDate ? 'color: #000;' : ''">
- {{ form.startDate ? form.startDate : '寮�濮嬫棩鏈�'}}
- </div>
- <span>-</span>
- <div class="Search_item_content_a" :style="form.endDate ? 'color: #000;' : ''">
- {{ form.endDate ? form.endDate : '缁撴潫鏃ユ湡'}}
- </div>
- </div>
- </div>
- </template>
- </v-Search>
- <div class="content_search_x"></div>
- <v-LableSelection :TagList="tagList" :isShow="true" @change="clickTag"></v-LableSelection>
- </div>
- <div class="content_total">鍏眥{page.total}}鏉℃暟鎹�</div>
- <div class="content_list">
- <scroll-view scroll-y="true" refresher-enabled="true" :refresher-triggered="refreshing"
- @scrolltolower="loadMore" @refresherrefresh="onRefresh" :style="{height: height}">
- <div class="content_list_item" v-for="(item, i) in list" :key="i" @click="jump(item)">
- <div class="content_list_item_top">
- <div class="content_list_item_top_left">
- <span v-if="item.mmodel">{{item.mmodel.name}} | {{item.procedureName}}</span>
- <div class="content_list_item_top_left_tag" v-if="item.urgent">浼樺厛{{item.urgent}}</div>
- <div class="content_list_item_top_left_tagW" v-if="item.paused === 1">鍋�</div>
- </div>
- <div class="content_list_item_top_right">
- <span class="yellow" v-if="item.status === 0">宸插垱寤�</span>
- <span class="green" v-if="item.status === 1">宸插鏂�</span>
- <span v-if="item.status === 2">宸插畬宸�</span>
- <span class="purple" v-if="item.status === 3">宸叉楠�</span>
- <span v-if="item.status === 4">宸叉姤宸�</span>
- <span v-if="item.status === 5">宸插叆搴�</span>
- <span v-if="item.status === 6">宸插彇娑�</span>
- <span v-if="item.status === 7">鐢熶骇涓�</span>
- </div>
- </div>
- <span class="f24">宸ュ崟缂栫爜: {{item.code}}</span>
- <div class="content_list_item_content">
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">鐗╂枡缂栫爜锛�</div>
- <div class="content_list_item_content_item_nr" v-if="item.mmodel">{{item.mmodel.code}}
- </div>
- </div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">璁″垝寮�宸ワ細</div>
- <div class="content_list_item_content_item_nr">{{item.planDate}}</div>
- </div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">鐢熶骇鎵规锛�</div>
- <div class="content_list_item_content_item_nr">{{item.batch}}</div>
- </div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">璁″垝鏁伴噺锛�</div>
- <div class="content_list_item_content_item_nr" v-if="item.umodel">
- {{item.planNum}}{{item.umodel.name}}
- </div>
- </div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">鐢熶骇璁惧锛�</div>
- <div class="content_list_item_content_item_nr" v-if="item.pgmodel">{{item.pgmodel.name}}
- </div>
- </div>
- <div class="content_list_item_content_item" v-if="item.status === 5">
- <div class="content_list_item_content_item_label">瀹屽伐鏁伴噺锛�</div>
- <div class="content_list_item_content_item_nr">{{item.proNum}}</div>
- </div>
- </div>
- </div>
- </scroll-view>
- </div>
- <!-- <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
- <van-list v-model:loading="loading" :finished="finished" finished-text="娌℃湁鏇村浜唦" @load="onLoad">
- </van-list>
- </van-pull-refresh> -->
-
- <l-calendar :lunar="false" v-model="isOpenDate" @change="onConfirm" :isRange="true" activeBgColor="#305ED5"
- rangeColor="#305ED5" rangeBgColor="rgba(48, 80, 213, 0.1)"></l-calendar>
-
- </view>
-</template>
-
-<script>
- import vSearch from '@/components/Search.vue'
- import vLableSelection from '@/components/LabelSelection.vue'
- import {
- gsdate
- } from '@/util/utils'
- import {
- getList,
- pageCount
- } from '@/util/api/WorkOrderAPI'
- export default {
- components: {
- vSearch,
- vLableSelection
- },
- data() {
- return {
- height: '',
- status: true,
- isOpenDate: false,
- refreshing: false,
- // tagList: [1,2,3],
- tagList: [{
- id: [2,3,7],
- name: '鐢熶骇涓�',
- num: ''
- }],
- minDate: '2021-01-01',
- maxDate: '',
- form: {
- startDate: '',
- endDate: '',
- mixParam: '',
- statusList: []
- },
- list: [],
- page: {
- capacity: 10,
- index: 1,
- total: 0
- }
- };
- },
- onLoad(opt) {
- this.$nextTick(() => {
- uni.createSelectorQuery().in(this).select('.content_search').boundingClientRect((rect) => {
- this.height = `calc(100vh - ${rect.height + 80}px)`
- }).exec()
- })
- if (opt.type == '1') {
- this.tagList = [{
- id: [0, 1],
- name: '寰呯敓浜�',
- num: ''
- },
- {
- id: [2, 3, 7],
- name: '鐢熶骇涓�',
- num: ''
- }
- ]
- } else {
- this.tagList = [{
- id: [2, 3, 7],
- name: '鐢熶骇涓�',
- num: ''
- }]
- }
- this.maxDate = gsdate(new Date(`${new Date().getFullYear() + 1}-12-30`))
- this.pageCounts()
- this.loadData()
- },
- methods: {
- reset() {
- this.form.startDate = ''
- this.form.endDate = ''
- this.search()
- },
- searchInput(val) {
- this.form.mixParam = val;
- this.search()
- },
- clickTag(v) {
- this.form.statusList = v
- this.search()
- },
- submit() {
- this.search()
- },
- onConfirm(value) {
- this.form.startDate = value.startDate
- this.form.endDate = value.endDate
- this.isOpenDate = false
- },
- onRefresh() {
- if (this.refreshing) return
- this.refreshing = true;
- this.search()
- },
- loadMore() {
- this.page.page += 1
- this.loadData()
- },
- search() {
- this.page.page = 1
- this.loadData()
- },
- loadData() {
- getList({
- ...this.page,
- model: {
- ...this.form,
- statusList: this.form.statusList.length === 0 ? this.tagList[0].id : this.form.statusList
- }
- })
- .then(res => {
- let {
- data
- } = res
- if (data.page == 1) {
- this.list = []
- }
- this.list.push(...data.records)
- this.page.total = data.total
- this.page.page = data.page
- })
- .catch(err => {
-
- })
- .finally(() => {
- this.refreshing = false
- })
- },
- pageCounts() {
- pageCount({}).then(res => {
- if (res.code === 200) {
- this.tagList.forEach(item => {
- if (item.name == '寰呯敓浜�') {
- item.num = res.data.startNum
- }
- if (item.name == '鐢熶骇涓�') {
- item.num = res.data.ingNum
- }
- if (item.name == '宸插畬鎴�') {
- item.num = res.data.endNum
- }
- })
- }
- })
- },
- jump(item) {
- uni.$emit('workOrder', item)
- uni.navigateBack()
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .content {
- .content_code {
- position: fixed;
- right: 30rpx;
- bottom: 100rpx;
-
- img {
- width: 138rpx;
- height: 138rpx;
- }
- }
-
- .content_top {
- top: 0 !important;
- }
-
- .content_search {
- padding: 30rpx;
- background: white;
- position: sticky;
- top: 88rpx;
- z-index: 9;
-
- .Search_item {
- margin-bottom: 40rpx;
-
- .Search_item_label {
- font-size: 30rpx;
- font-weight: 500;
- color: #222222;
- }
-
- .Search_item_content {
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-top: 30rpx;
-
- .tag {
- display: flex;
- flex-wrap: wrap;
- align-items: center;
-
- .tag_active {
- background: $nav-color !important;
- color: #ffffff !important;
- }
-
- .tag_item {
- width: 156rpx;
- height: 70rpx;
- box-sizing: border-box;
- background: #F2F2F2;
- border-radius: 8rpx;
- font-size: 26rpx;
- font-weight: 400;
- color: #333333;
- display: flex;
- align-items: center;
- justify-content: center;
- margin-right: 22rpx;
- margin-bottom: 22rpx;
-
- &:nth-child(4n) {
- margin-right: 0;
- }
- }
- }
-
- span {
- font-size: 26rpx;
- font-weight: 400;
- color: #333333;
- }
-
- .Search_item_content_a {
- width: 308rpx;
- height: 70rpx;
- background: #F7F7F7;
- border-radius: 8rpx;
- border: 1rpx solid #EEEEEE;
- font-size: 26rpx;
- font-weight: 400;
- color: #B2B2B2;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- }
-
- .content_search_x {
- height: 24rpx;
- }
- }
-
- .content_total {
- padding: 24rpx 30rpx;
- background: #F7F7F7;
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- }
-
- .content_list {
- width: 100%;
- // height: 100%;
- display: flex;
- flex-direction: column;
-
- .content_list_item {
- padding: 30rpx;
- display: flex;
- flex-direction: column;
- border-bottom: 1rpx solid #ececec;
- background: white;
-
- span {
- color: #5a5a5a;
- margin-top: 15rpx;
- }
-
- .content_list_item_top {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- .content_list_item_top_left {
- display: flex;
- align-items: center;
- width: 80%;
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #333333;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- -o-text-overflow: ellipsis;
- }
-
- .content_list_item_top_left_tagW {
- margin-top: 14rpx;
- flex-shrink: 0;
- box-sizing: border-box;
- padding: 5rpx 10rpx;
- background: $nav-stateColor5;
- border-radius: 8rpx;
- font-size: 22rpx;
- font-weight: 400;
- color: #FFFFFF;
- margin-left: 16rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- }
-
- .content_list_item_top_left_tag {
- margin-top: 14rpx;
- flex-shrink: 0;
- padding: 5rpx 10rpx;
- background: $nav-stateColor4;
- border-radius: 8rpx;
- font-size: 22rpx;
- font-weight: 400;
- color: #FFFFFF;
- margin-left: 16rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
-
- .content_list_item_top_right {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
-
- .purple {
- color: $nav-color !important;
- }
-
- .green {
- color: $nav-stateColor6 !important;
- }
-
- .yellow {
- color: $nav-stateColor1 !important;
- }
- }
- }
-
- .content_list_item_content {
- padding: 24rpx 30rpx;
- background: #F7F7F7;
- border-radius: 16rpx;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- margin-top: 32rpx;
-
- .content_list_item_content_item {
- width: 50%;
- display: flex;
- margin-top: 24rpx;
-
- &:nth-child(1) {
- margin-top: 0 !important;
- }
-
- &:nth-child(2) {
- margin-top: 0 !important;
- }
-
- .content_list_item_content_item_label {
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .content_list_item_content_item_nr {
- font-size: 24rpx;
- font-weight: 400;
- color: #222222;
- margin-right: 10rpx;
- }
- }
- }
- }
- }
- }
-</style>
diff --git a/minipro_standard/pages/workbench/workbench.vue b/minipro_standard/pages/workbench/workbench.vue
deleted file mode 100644
index 6576a75..0000000
--- a/minipro_standard/pages/workbench/workbench.vue
+++ /dev/null
@@ -1,135 +0,0 @@
-<template>
- <view class="index">
- <view class="menu">
- <view class="menu_list" v-for="(row, i) in Menu" :key="i">
- <view class="menu_list_head">
- <span>{{row.label}}</span>
- </view>
- <div class="menu_list_list">
- <view class="menu_list_item" v-for="item in row.children" :key="item.id" @click="jump(item.urlSec)">
- <image :src="item.icon" mode="widthFix" />
- <span>{{item.label}}</span>
- </view>
- <view class="menu_list_zw"></view>
- <view class="menu_list_zw"></view>
- <view class="menu_list_zw"></view>
- </div>
- </view>
- </view>
- <myTabbar :index="1" />
- </view>
-</template>
-
-<script>
- import myTabbar from "@/components/myTabber.vue"
- import { mapState } from 'vuex'
-
- export default {
- components: {
- myTabbar
- },
- computed: {
- ...mapState(['Menu'])
- },
- data() {
- return {
-
- };
- },
- onLoad() {
- this.$store.dispatch('getUpcomingNum')
- uni.hideTabBar()
- },
- methods: {
- jump(url) {
- console.log(url);
- uni.navigateTo({ url });
- }
- }
- }
-</script>
-<style>
- page {
- background-color: #F7F7F7 !important;
- }
-</style>
-<style scoped lang="scss">
-.index {
- width: 100%;
- .menu {
- width: 100%;
- display: flex;
- flex-direction: column;
- .menu_list {
- display: flex;
- flex-direction: column;
- padding: 30rpx;
- box-sizing: border-box;
- margin-bottom: 20rpx;
- background: white;
- &:last-child {
- margin-bottom: 0;
- }
- .menu_list_head {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-bottom: 40rpx;
- span {
- font-size: 32rpx;
- font-family: PingFangSC-Medium, PingFang SC;
- font-weight: 500;
- color: #222222;
- }
- }
- .menu_list_list {
- width: 100%;
- display: flex;
- align-items: center;
- flex-wrap: wrap;
- justify-content: space-between;
- .menu_list_zw {
- width: 20%;
- height: 0;
- }
- .menu_list_item {
- width: 20%;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- margin-top: 40rpx;
- &:nth-child(1) {
- margin: 0;
- }
- &:nth-child(2) {
- margin: 0;
- }
- &:nth-child(3) {
- margin: 0;
- }
- &:nth-child(4) {
- margin: 0;
- }
- &:nth-child(5) {
- margin: 0;
- }
- image {
- width: 88rpx;
- height: 88rpx;
- border-radius: 24rpx;
- overflow: hidden;
- }
- span {
- font-size: 24rpx;
- font-weight: 400;
- color: #333333;
- margin-top: 16rpx;
- }
- }
- }
- }
- }
-}
-</style>
diff --git a/minipro_standard/pages_adjust/components/multipleMaterial.vue b/minipro_standard/pages_adjust/components/multipleMaterial.vue
deleted file mode 100644
index 2336949..0000000
--- a/minipro_standard/pages_adjust/components/multipleMaterial.vue
+++ /dev/null
@@ -1,320 +0,0 @@
-<template>
- <u-popup :show="show" :round="10" closeable @close="show = false">
- <view class="material-content bbox p30 rp">
- <view class="tc b f32 c2 mb20">閫夋嫨鐗╂枡</view>
- <v-Search @searchInput="searchInput" @submit="submit" :isShow="false" placeholder="鎼滅储鐗╂枡鍚嶇О/缂栫爜" />
- <div class="content_total">鍏眥{form.total}}鏉℃暟鎹�</div>
- <view class="scroll-content">
- <scroll-view
- scroll-y="true"
- @scrolltolower="loadMore">
- <view v-for="(item1, index) in list" :key="index" class="flex mb20" @click="jump(index)">
- <view class="img36 mr20 pt10" style="position: relative;">
- <u-checkbox-group style="display: block;" name="" @change="jump(index)">
- <u-checkbox :checked="item1.isActive"></u-checkbox>
- </u-checkbox-group>
- <view style="width: 18px; height: 18px; position: absolute; top: 0; left: 0; z-index: 99;"></view>
- </view>
- <view class="fx1">
- <div class="page_content_title_top">
- <span>{{ item1.materialName + ' | ' + item1.materialCode }}</span>
- </div>
- <div class="page_content_title_bottom">
- <span class="green" v-if="item1.qualityType == 0">
- 鍚堟牸
- <text class="c1" decode>{{ splite }}</text>
- </span>
- <span class="orange" v-else-if="item1.qualityType == 1">
- 涓嶈壇
- <text class="c1" decode>{{ splite }}</text>
- </span>
- <span class="red" v-else-if="item1.qualityType == 2">
- 鎶ュ簾
- <text class="c1" decode>{{ splite }}</text>
- </span>
- <span v-else>
- -
- <text class="c1" decode>{{ splite }}</text>
- </span>
- <span>
- {{item1.procedureName ? item1.procedureName : '-'}}
- <text class="c1" decode>{{ splite }}</text>
- </span>
- <span>{{item1.batch ? item1.batch : '-'}}</span>
- </div>
- <div class="mt20 plr25 ptb20 bg_f7 f26">
- <div class="c2 mb10"><span class="c6">璐т綅锛�</span>{{ item1.locationName }}</div>
- <div class="c2"><span class="c6">鏁伴噺锛�</span>{{ item1.num }}{{ item1.unitName }}</div>
- </div>
- </view>
- </view>
- </scroll-view>
- <!-- <u-list @scrolltoupper="scrolltoupper" @scrolltolower="scrolltolower">
- <u-list-item v-for="(item1, index) in list" :key="index">
-
- </u-list-item>
- </u-list> -->
- </view>
- <view style="height: 98rpx;"></view>
- <!-- <view class="">
- <u-safe-bottom></u-safe-bottom>
- </view> -->
- <view class="fixedBottom bottom cY">
- <view class="fx1 bbox plr30">
- <u-checkbox-group v-model="isAll" style="display: block;" @change="selectAll()">
- <u-checkbox label="鍏ㄩ��" name="all"></u-checkbox>
- </u-checkbox-group>
- </view>
- <view class="submit sbtn_green bbox tc" @click="submitAction">{{ `鎻愪氦(${totalNum})`}}</view>
- </view>
- </view>
- </u-popup>
-</template>
-
-<script>
- import vSearch from '@/components/Search.vue'
- import { choiceStockListPage } from '@/util/api/agencyAPI'
-
- export default {
- name: "selectMaterial",
- components: {
- vSearch
- },
- data() {
- return {
- show: false,
- splite: ' | ',
- form: {
- capacity: 50,
- page: 0,
- total: 0,
- smodelLabel: '',
- categoryId: ''
- },
- list: [],
- loading: false,
- finished: false,
- refreshing: false,
- isAll: false,
- total: 0
- };
- },
- props: {
- warehouseId: {
- type: String,
- default: ''
- },
- warehouseQualityType: {
- type: String,
- default: ''
- },
- selected: {
- type: Array,
- default: []
- }
- },
- computed: {
- all() {
- for (let i = 0; i < this.list.length; i++) {
- if (!this.list[i].isActive) {
- return false
- }
- }
- return true
- },
- totalNum() {
- let num = 0;
- this.list.forEach(item => {
- if (item.isActive) {
- num += 1
- }
- })
- return num;
- }
- },
- methods: {
- open() {
- this.isAll = false
- this.show = true
- this.refreshing = false
- this.finished = false
- this.list = []
- this.form.page = 0
- this.form.total = 0
- this.loadData()
- },
- jump(index) {
- this.list.forEach((item, i) => {
- if (index === i) {
- item.isActive = !item.isActive
- }
- })
- for (let i = 0; i < this.list.length; i++) {
- if (!this.list[i].isActive) {
- this.isAll = []
- return
- }
- }
- this.isAll = ['all']
- },
- // 鎼滅储鎻愪氦
- submit() {
- this.form.page = 0
- this.finished = false
- this.list = []
- this.loadData()
- },
- // 鎼滅储妗�
- searchInput(data) {
- this.form.page = 0
- this.finished = false
- this.list = []
- this.form.smodelLabel = data
- this.loadData()
- },
- loadData() {
- if (!this.finished) {
- this.loading = true;
- this.form.page = this.form.page += 1
- choiceStockListPage({
- capacity: this.form.capacity,
- page: this.form.page,
- model: {
- warehouseId: this.warehouseId,
- warehouseQualityType: this.warehouseQualityType,
- ids: this.selected.length > 0 ? this.selected.join(',') : '',
- materialName: this.form.smodelLabel
- }
- }).then(res => {
- if (this.refreshing) {
- this.list = []
- this.refreshing = false;
- }
- this.loading = false;
- if (res.code === 200 && res.data.records && res.data.records.length !== 0) {
- this.form.total = res.data.total
- res.data.records.forEach(element => {
- element.isActive = false
- })
- this.list.push(...res.data.records)
- } else {
- this.finished = true;
- }
- }).catch(err => {
- this.loading = false;
- this.finished = true;
- if (this.refreshing) {
- this.list = []
- this.refreshing = false;
- }
- })
- }
- },
- loadMore() {
- this.pages.page += 1
- this.loadData()
- },
- onRefresh() {
- if (this.refreshing) return
- this.refreshing = true;
- this.pages.page = 1
- this.loadData()
- },
- selectAll(e) {
- this.list.forEach(element => {
- element.isActive = e.length > 0 ? true : false
- })
- },
- submitAction () {
- this.show = false
- let arr = []
- this.list.forEach(element => {
- if (element.isActive) {
- arr.push(element)
- }
- })
- this.$emit('value', arr)
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .material-content {
- display: flex;
- flex-direction: column;
- height: 1200rpx;
- box-sizing: border-box;
-
- .scroll-content {
- height: calc(1100rpx - env(safe-area-inset-bottom));
- overflow: scroll;
- }
- }
-
- .content_total {
- margin-top: 20rpx;
- margin-bottom: 20rpx;
- // padding: 24rpx 30rpx;
- // background: #F7F7F7;
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- }
-
- .page_content_title_top {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- span {
- &:nth-child(1) {
- font-size: 30rpx;
- font-weight: 500;
- color: #222222;
- }
-
- &:nth-child(2) {
- flex-shrink: 0;
- font-size: 24rpx;
- font-weight: 400;
- color: #333333;
-
- // span {
- // font-size: 24rpx;
- // color: $nav-color;
- // }
- }
- }
- }
-
- .page_content_title_bottom {
- margin-top: 24rpx;
-
- span {
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- }
- }
-
- .page_content_title {
- display: flex;
- flex-direction: column;
- margin-bottom: 10rpx;
-
-
-
-
- }
-
- .bottom {
- height: 98rpx;
-
- .submit {
- width: 272rpx;
- height: 98rpx;
- line-height: 98rpx;
- }
- }
-</style>
\ No newline at end of file
diff --git a/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue b/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
deleted file mode 100644
index d389e46..0000000
--- a/minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue
+++ /dev/null
@@ -1,1059 +0,0 @@
-<template>
- <view class="content">
- <workOrderInfo :orederMessage="info" />
- <view class="bg_cate">
- <view @click="clickIten(index)" :class="typeView == index ? 'bg_cate_item active' : 'bg_cate_item'"
- v-for="(item, index) in cate" :key="index">{{ item.name }}</view>
- </view>
- <div v-if="typeView==0" class="bg_list">
- <div class="bg_list_item">
- <div class="bg_list_item_top">
- <div class="bg_list_item_top_left">
- <div class="bg_list_item_top_left_x bg_m"></div>
- <span>鎶曟枡鏄庣粏</span>
- </div>
- </div>
-
- <template v-if="feedingData && feedingData.length > 0">
- <view class="plr30 bg_w">
- <view >
- <div v-for="(item, index) in feedingData" :key="index" class="bg_list_item_h">
- <div class="bg_list_item_num">
- <div class="bg_list_item_num_item">
- <div class="bg_list_item_num_item_wl">
- <span> {{ item.materialName || '澧欎綋鐮�' }}{{ item.procedureName ? ` | ${item.procedureName}` : ''
- }}</span>
- <div class="bg_list_item_num_item_wl_lx">
- <span class="green" v-if="item.qualityType == 0">鍚堟牸<text class="c6" decode>{{ split }}</text></span>
- <span class="orange" v-if="item.qualityType == 1">涓嶈壇<text class="c6" decode>{{ split }}</text></span>
- <span class="red" v-if="item.qualityType == 2">鎶ュ簾<text class="c6" decode>{{ split }}</text></span>
- <span>{{ item.locationName }}</span>
- <span v-if="item.batch"><text class="c6" decode>{{ split }}</text>{{ item.batch }}</span>
- </div>
- </div>
- <div class="bg_list_item_num_item_sr">
- <view class="cY">
- <view class="mr10">{{ item.num }}</view>
- <span>{{ item.unitName }}</span>
- </view>
-
- </div>
- </div>
- </div>
- </div>
- </view>
- </view>
-
- </template>
- <template v-else>
- <div class="kong">
- <span>鏆傛棤鏁版嵁</span>
- </div>
- </template>
- </div>
- <div class="bg_list_item">
- <div class="bg_list_item_top">
- <div class="bg_list_item_top_left">
- <div class="bg_list_item_top_left_x bg_m"></div>
- <span>浜у嚭鏄庣粏</span>
- </div>
- <div class="bg_list_item_top_right" @click="proRecord">
- <span style="color: #4275FC;">鏌ョ湅妫�楠岃褰�</span>
- <u-icon name="arrow-right" color="#4275FC" />
- </div>
- </div>
- <div class="bg_list_item_h">
- <div class="bg_list_item_num plr30">
- <div class="bg_list_item_num_item">
- <span>鑹搧鏁皗{ info.umodel ? `(${info.umodel.name})` : '' }}</span>
- <div class="bg_list_item_num_item_sr">
- <view class="mr10">{{ produceFrom.qualified }}</view>
- <span v-if="info.umodel">{{ info.umodel.name }}</span>
- </div>
- </div>
- </div>
- </div>
- <div class="bg_list_item_h">
- <div class="bg_list_item_num plr30">
- <div class="bg_list_item_num_item">
- <span>涓嶈壇鏁皗{ info.umodel ? `(${info.umodel.name})` : '' }}</span>
- <div class="bg_list_item_num_item_sr">
- <view class="mr10">{{ produceFrom.undesirable }}</view>
- <span v-if="info.umodel">{{ info.umodel.name }}</span>
- </div>
- </div>
- </div>
- </div>
- <!-- <div class="bg_list_item_h">
- <div class="bg_list_item_num plr30">
- <div class="bg_list_item_num_item">
- <span>涓嶈壇鏁皗{ info.umodel ? `(${info.umodel.name})` : '' }}</span>
- <div class="bg_list_item_num_item_sr">
- <view class="mr10">{{ produceFrom.undesirable }}</view>
- <span v-if="info.umodel">{{ info.umodel.name }}</span>
- </div>
- </div>
- </div>
- </div> -->
- </div>
- <div class="bg_list_item">
- <div class="bg_list_item_top">
- <div class="bg_list_item_top_left">
- <div class="bg_list_item_top_left_x bg_m"></div>
- <span>宸ヨ祫缁╂晥</span>
- </div>
- </div>
- <div class="bg_list_item_h mb40 ">
- <div class="bg_list_item_num plr30" style="display: block;">
- <div class="bX ptb15">
- <div class="f30 c2">棰勮宸ヨ祫</div>
- <div class="f28" style="color:#4275FC">{{ (performance.salary / 10 / 10).toFixed(2) }}鍏�</div>
- </div>
- <div class="f24 c6">
- {{ performance.salaryType == 0 ? '璁′欢' : '璁℃椂' }} |
- {{ (performance.salaryPrice / 10 / 10).toFixed(2) }}鍏�/{{ performance.salaryType ==
- 0 ? '浠�' : '鏃�' }} |
- 杈炬爣鐜囷細{{ complianceRate }}%
- </div>
- </div>
- </div>
- </div>
- </div>
- <div v-else class="bg_list">
- <template v-if="djData && djData.length > 0">
- <div class="details_dj">
- <div class="details_dj_list">
- <view v-for="(item, index) in djData" :key="index">
- <div class="details_dj_list_item">
- <span>{{ item.attrName }}锛歿{ item.val }}</span>
- <span>{{ item.userName }} {{ item.createTime }}</span>
- </div>
- </view>
- <!-- <scroll-view scroll-y="true" refresher-enabled="true" @scrolltolower="getLists">
-
- </scroll-view> -->
- </div>
- </div>
- </template>
- <template v-else>
- <div class="kong">
- <span>鏆傛棤鏁版嵁</span>
- </div>
- </template>
- </div>
- </div>
-
- </view>
-</template>
-
-<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'
- import {
- categoryExtList,
- queryOne,
- queryList
- } from '@/util/api/PlanningAPI'
- import {
- REGULAR
- } from '@/util/utils'
- export default {
- components: {
- workOrderInfo
- },
- data() {
- return {
- cate: [{
- name: '鐢熶骇'
- },
- {
- name: '鐐规'
- }
- ],
- split: ' / ',
- workorderId: '',
- form: {
- time: '',
- efective: [],
- defectiveName: '',
- durationName: '0灏忔椂0鍒嗛挓',
- duration: 0,
- type: 0,
- index: 0
- },
- info: {},
- TimeShow: false,
- badShow: false,
- typeView: 0,
- feedingData: [],
- options: [{
- text: '鍒犻櫎',
- style: {
- backgroundColor: 'red',
- }
- }],
- arrType: [],
- // 浜у嚭鍚堟牸/涓嶈壇
- produceFrom: {
- qualifiedId: '',
- qualified: '', // 鍚堟牸
- undesirableId: '',
- undesirable: 5 // 涓嶈壇
- },
- pages: {
- capacity: 10,
- page: 1,
- total: 0
- },
- djData: [],
- cateList: [],
- finished: true,
- performance: {}
- };
- },
- onLoad(obj) {
- this.workorderId = obj.id
- this.queryByIds()
- this.getOrocessRecords()
- this.getData()
- this.pageDJs()
- this.getOrocessRecordCC()
- uni.$on('spotAdd', () => {
- if (this.typeView == 1) {
- this.pages.page = 1
- this.pageDJs()
- }
- })
- },
- computed: {
- complianceRate() {
- if (!this.performance) return 0;
- let {duration, salaryNum, salaryTimes, qualifiedNum, unqualifiedNum, salaryUnqualified} = this.performance
- // 鎶ュ伐鏃堕暱
- if (!duration) return 0;
- debugger
- // 鎶ュ伐鏁伴噺
- if (!qualifiedNum && !unqualifiedNum) return 0;
- // 鏍囧噯鏁伴噺銆佹椂闀�
- if (!salaryNum || !salaryTimes) return 0
-
- if (salaryUnqualified == 1) { // 鏄惁璁″叆涓嶈壇鍝�
- let a = ((Number(qualifiedNum) + Number(unqualifiedNum)) / (duration / 3600)).toFixed(2)
- let b = (salaryNum / (salaryTimes / 3600)).toFixed(2)
- return ((Number(a) / Number(b)) * 100).toFixed(2)
- } else {
- let a = (qualifiedNum / (duration / 3600)).toFixed(2)
- let b = (salaryNum / (salaryTimes / 3600)).toFixed(2)
- return ((Number(a) / Number(b)) * 100).toFixed(2)
- }
- }
- },
- methods: {
- getData() {
- categoryExtList({
- cateType: "3"
- }).then(res => {
- if (res.code === 200) {
- res.data.forEach(item => {
- item.active = false
- item.num = ''
- })
- this.cateList = res.data
- }
- })
- },
- clickIten(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
- }) {
- console.log(value)
- let h = Number(value.substring(0, 2))
- let m = Number(value.substring(3, 5))
- let s = 0
- if (h > 0) {
- s += h * 60 * 60
- }
- if (m > 0) {
- s += m * 60
- }
- this.form.duration = s
- this.form.durationName = `${h}灏忔椂${m}鍒嗛挓`
- this.TimeShow = false
- },
- // 缂栬緫鎶曟枡/浜у嚭
- change(id, num, type, maxNum, item, unitAttribute) {
- let obj = item
- if (type === 'T') {
- if (unitAttribute == 0 && num != '') {
- if (!REGULAR.positiveInteger.test(num)) {
- obj.num = obj.ynum
- uni.$u.toast('鍙兘杈撳叆姝ｆ暣鏁�')
- return
- }
- }
- if (unitAttribute == 1 && num != '') {
- if (!REGULAR.number.test(num)) {
- uni.$u.toast('鍙兘杈撳叆姝ｆ暣鏁版垨灏忔暟锛堟渶澶氬洓浣嶏級')
-
- obj.num = obj.ynum
- return
- }
- }
- if (num > maxNum) {
- obj.num = obj.ynum
- uni.$u.toast('瓒呭嚭宸ヨ鎬绘暟')
-
- return
- }
- } else if (type === 'C' && num > info.value.planNum) {
- obj.num = obj.ynum
- uni.$u.toast('浜у嚭鏁伴噺涓嶈兘瓒呰繃璁″垝鏁伴噺')
-
- return
- }
-
- },
- 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}`
- })
- },
- proRecord() {
- uni.navigateTo({
- url: `/pages_inspect/pages/InspectionRecords/InspectionRecords?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) {
- this.finished = false
- this.pages.page = 1
- this.pageDJs()
- }
- })
- },
- 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
- }
- })
- },
- getOrocessRecordCC() {
- getWorkorderRecordListStandard({
- workorderId: this.workorderId
- }).then(res => {
- // console.log(res.data[0]);
- if (res.data.length > 0) {
- this.produceFrom.qualified = res.data[0].qualifiedNum
- this.produceFrom.undesirable = res.data[0].unqualifiedNum
- this.performance = res.data[0]
- }
- })
- },
- jumpTL() {
- uni.navigateTo({
- // url: ''
- url: `/pages_adjust/pages/manualFeed/manualFeed?id=${this.workorderId}`
- })
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .content {
- height: 100vh;
- background-color: #f7f7f7;
- }
- .bg_cate {
- width: 100%;
- height: 88rpx;
- background: #FFFFFF;
- display: flex;
- align-items: center;
- // border-top: 20rpx solid #f7f7f7;
- .active {
- box-sizing: border-box;
- color: #305ED5 !important;
- font-weight: 500;
- border-bottom: 3rpx solid #305ED5;
- }
-
- .bg_cate_item {
- flex: 1;
- height: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 30rpx;
- font-weight: 400;
- color: #555555;
- }
- }
-
- .bg_list {
- width: 100%;
- display: flex;
- flex-direction: column;
- // margin-top: 30rpx;
-
- .bg_list_item {
- display: flex;
- flex-direction: column;
- // margin-bottom: 40rpx;
- // border-bottom: 40rpx #f7f7f7 solid;
-
-
-
- .bg_list_item_top {
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding: 30rpx;
- background-color: #f7f7f7;
-
- .bg_list_item_top_left {
- display: flex;
- align-items: center;
-
- .left {
- margin-left: 12rpx;
- font-size: 28rpx;
- }
-
- .warning {
- width: 8rpx;
- height: 30rpx;
- border-radius: 2rpx;
- margin-right: 12rpx;
- // background: $nav-stateColor5 !important;
- }
-
- .error {
- width: 8rpx;
- height: 30rpx;
- border-radius: 2rpx;
- margin-right: 12rpx;
- // background: $nav-stateColor4 !important;
- }
-
- .bg_list_item_top_left_x {
- width: 8rpx;
- height: 30rpx;
- // background: $nav-color;
- border-radius: 2rpx;
- margin-right: 12rpx;
- }
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
- display: flex;
- align-items: center;
- }
- }
-
- .bg_list_item_top_right {
- display: flex;
- align-items: center;
-
- image {
- width: 28rpx;
- height: 28rpx;
- margin-right: 12rpx;
- }
-
- span {
- font-size: 28rpx;
- font-weight: 400;
- }
- }
- }
-
- .bg_list_item_h {
- width: 100%;
- box-sizing: border-box;
- background: white;
- border-bottom: 1rpx solid #E5E5E5;
- padding: 15rpx 0;
- &:last-child {
- border: none !important;
- }
- .bg_list_item_num {
- width: 100%;
- min-height: 98rpx;
- background: white;
- box-sizing: border-box;
- display: flex;
- justify-content: center;
- align-items: center;
- .kong {
- text-align: center;
- font-size: 25rpx;
- padding: 30rpx 0;
- background: #ffffff;
- }
-
- .bg_list_item_num_item {
- width: 100%;
- height: 100%;
- display: flex;
- align-items: center;
- // height: 118rpx;
- // padding: 15rpx 0;
- box-sizing: border-box;
- justify-content: space-between;
- // border-bottom: 3rpx solid #111;
-
- &:last-child {
- border: none;
- }
-
- .bg_list_item_num_item_list {
- display: flex;
- align-items: center;
-
- .active {
- background: #305ED5 !important;
- color: #FFFFFF !important;
- }
-
- .bg_list_item_num_item_list_item {
- width: 116rpx;
- height: 62rpx;
- line-height: 62rpx;
- text-align: center;
- background: #F2F2F2;
- border-radius: 8rpx;
- font-size: 26rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #333333;
- margin-right: 20rpx;
-
- &:last-child {
- margin: 0 !important;
- }
- }
- }
-
- .bg_list_item_num_item_wl {
- flex-shrink: 0;
- display: flex;
- flex-direction: column;
- font-size: 34rpx;
- color: #222222;
-
- .bg_list_item_num_item_wl_lx {
- margin-top: 10rpx;
- color: #222222;
- font-size: 28rpx;
- }
- }
-
- // .warning {
- // color: $nav-stateColor5 !important;
- // }
-
- // .err {
- // color: $nav-stateColor4 !important;
- // }
-
- img {
- width: 12rpx;
- height: 24rpx;
- margin-left: 20rpx;
- }
-
- span {
- flex-shrink: 0;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-
- b {
- font-size: 30rpx;
- color: red;
- margin-right: 5rpx;
- }
-
- // .warning {
- // color: $nav-stateColor5 !important;
- // margin-right: 5rpx;
- // }
-
- // .err {
- // color: $nav-stateColor4 !important;
- // margin-right: 5rpx;
- // }
-
- &:nth-child(1) {
- font-size: 30rpx;
- font-weight: 400;
- color: #222222;
- }
-
- &:nth-child(2) {
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
- flex-shrink: 0;
- }
- }
-
- .bg_list_item_num_item_sr {
- flex: 1;
- display: flex;
- align-items: center;
- justify-content: flex-end;
- font-size: 28rpx;
- .color1 {
-
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #333333;
- }
-
- input::-webkit-input-placeholder {
- font-size: 28rpx;
- }
-
- input {
- text-align: right;
- width: 180rpx;
- height: 60rpx;
- border-radius: 8rpx;
- border: 1rpx solid #E5E5E5;
- margin-right: 20rpx;
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
- padding: 0 30rpx
- }
-
- .wulll {
- width: 400rpx;
- text-align: right;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- span {
- font-size: 28rpx;
- font-weight: 400;
- color: #999999;
- }
- }
- }
- }
- }
- }
- }
-
- .bg_plan {
- width: 100%;
- // height: 98px;
- padding: 30rpx;
- box-sizing: border-box;
- background: #FFFFFF;
- margin-bottom: 40rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- span {
- font-size: 30rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #222222;
-
- b {
- color: red;
- }
- }
-
- .bg_plan_nr {
- display: flex;
- flex-direction: column;
-
- span {
- font-size: 24rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #666666;
- margin-top: 20rpx;
-
- &:first-child {
- font-size: 32rpx;
- font-family: PingFangSC-Medium, PingFang SC;
- font-weight: 500;
- color: #333333;
- margin-top: 0 !important;
- }
- }
- }
-
- .bg_plan_label_val {
- display: flex;
- align-items: center;
-
- span {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- }
-
-
- }
- }
-
- .img_ar {
- width: 12rpx;
- height: 24rpx;
- margin-left: 20rpx;
- }
-
- .bh_zw {
- height: 160rpx;
- }
-
- .bg_footer {
- position: fixed;
- bottom: 0;
- left: 0;
- width: 100%;
- padding: 30rpx 30rpx 60rpx 30rpx;
- box-sizing: border-box;
-
- .bg_footer_submit1 {
- width: 690rpx;
- height: 76rpx;
- background: #FFFFFF;
- border-radius: 36rpx;
- border: 1rpx solid #E5E5E5;
- display: flex;
- align-items: center;
- justify-content: center;
-
- .fornt-img {
- width: 28rpx;
- height: 28rpx;
- margin-right: 12rpx;
- }
-
- span {
- font-size: 26rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #305ED5;
- }
- }
-
- .bg_footer_submit {
- width: 690rpx;
- height: 88rpx;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- font-size: 30rpx;
- font-weight: 500;
- color: #FFFFFF;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
-
- .details_dj {
- display: flex;
- flex-direction: column;
-
- .details_dj_list {
- width: 100%;
- box-sizing: border-box;
- background: #ffffff;
- display: flex;
- flex-direction: column;
-
- .details_dj_list_item {
- display: flex;
- flex-direction: column;
- border-bottom: 1rpx solid #E5E5E5;
- padding: 30rpx;
- line-height: 42rpx;
-
- span {
- &:nth-child(1) {
- font-size: 28rpx;
- font-weight: 400;
- color: #222222;
- }
-
- &:nth-child(2) {
- font-size: 24rpx;
- font-weight: 400;
- color: #999999;
- }
- }
- }
- }
-
- .details_dj_title {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding: 0 30rpx 30rpx;
- box-sizing: border-box;
-
- .details_dj_title_left {
- display: flex;
- align-items: center;
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
- }
- }
-
- }
- }
-
- .contanir {
- height: calc(env(safe-area-inset-bottom) + 720rpx);
-
- .content {
- margin-top: 20rpx;
-
- .type-style {
- width: 325rpx;
- margin-bottom: 20rpx;
- }
- }
- }
-
- .bottom-view {
- left: 40rpx;
- right: 40rpx;
- bottom: 0
- }
-
- .bl_list {
- width: 100%;
- height: calc(100% - 168rpx);
- overflow-y: scroll;
- margin-top: 30rpx;
-
- .bl_list_item {
- width: 100%;
- height: 96rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rPX solid #E5E5E5;
-
- &:last-child {
- border: none !important;
- }
-
- .bl_list_item_left {
- flex: 1;
- display: flex;
- align-items: center;
-
- input {
- width: 30rpx;
- height: 30rpx;
- border: 1rpX solid #CCCCCC;
- margin: 0 !important;
- }
-
- span {
- font-size: 30rpx;
- color: #222222;
- margin-left: 10rpx;
- }
- }
-
- .bl_list_item_right {
- flex: 1;
- height: 50rpx;
- text-align: right;
-
- input {
- padding-left: 5rpx;
- width: 160rpx;
- height: 100%;
- padding: 0 30rpx;
- box-sizing: border-box;
- text-align: right;
- font-size: 28rpx;
- color: #333333;
- border-radius: 10rpx;
- border: 1rPX solid #CCCCCC;
-
- &::-webkit-input-placeholder {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- }
- }
- }
- }
- }
- .kong {
- text-align: center;
- padding: 30rpx 0;
- // background: #ffffff;
- font-size: 25rpx;
-
- span {
- color: #474747;
- }
- }
-</style>
diff --git a/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue b/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue
deleted file mode 100644
index 719298a..0000000
--- a/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue
+++ /dev/null
@@ -1,577 +0,0 @@
-<template>
- <view class="rework">
- <view class="rework_list">
- <view class="rework_list_item">
- <text><b>*</b>鍗曟嵁绫诲瀷</text>
- <view class="rework_list_item_right" @click="typeShow = true">
- <text :class="form.typeName ? 'black' : ''">{{form.typeName ? form.typeName : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right"></u-icon>
- </view>
- </view>
- <view class="rework_list_item">
- <text><b>*</b>鍏ュ簱浠撳簱</text>
- <view class="rework_list_item_right" @click="warehouseShow = true">
- <text :class="form.warehouseName ? 'black' : ''">{{form.warehouseName ? form.warehouseName : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right"></u-icon>
- </view>
- </view>
- </view>
- <view class="rework_qd">
- <view class="rework_qd_title">
- <view class="rework_qd_title_left">
- <view class="x"></view>
- <text>鍏ュ簱鐗╂枡娓呭崟</text>
- </view>
- <view class="rework_qd_title_right" @click="addItem()">
- <image src="@/static/gongdan_ic_shoudong@2x.png" mode="widthFix"></image>
- <text>澧炲姞鍏ュ簱</text>
- </view>
- </view>
- <u-swipe-action :autoClose="true">
- <u-swipe-action-item v-for="(item, index) in list" :key="index" @click="dele($event, index)" :options="item.options">
- <view class="rework_qd_list">
- <view class="rework_qd_item" @click="openL(index)">
- <text><b>*</b>鍏ュ簱璐т綅</text>
- <view class="rework_qd_item_right">
- <text :class="item.locationName ? 'black' : ''">{{item.locationName ? item.locationName : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right"></u-icon>
- </view>
- </view>
- <view class="rework_qd_item" @click="openMaterial(index)">
- <text><b>*</b>鍏ュ簱鐗╂枡</text>
- <view class="rework_qd_item_right">
- <text :class="item.materialName ? 'black' : ''">{{item.materialName ? item.materialName : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right"></u-icon>
- </view>
- </view>
- <template v-if="form.type !== 25">
- <view class="rework_qd_item" @click="openGX(index)">
- <text>鐢熶骇宸ュ簭</text>
- <view class="rework_qd_item_right">
- <text :class="item.procedureName ? 'black' : ''">{{item.procedureName ? item.procedureName : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right"></u-icon>
- </view>
- </view>
- </template>
- <view class="rework_qd_item" @click="openQ(index)">
- <text><b>*</b>璐ㄩ噺灞炴��</text>
- <view class="rework_qd_item_right">
- <text :class="item.qualityTypeName ? 'black' : ''">{{item.qualityTypeName ? item.qualityTypeName : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right"></u-icon>
- </view>
- </view>
- <view class="rework_qd_item">
- <text>鎵规鍙�</text>
- <view class="rework_qd_item_right">
- <u--input placeholder="璇疯緭鍏�" inputAlign="right" :customStyle="{width: '230rpx'}" border="surround" v-model="item.batch"></u--input>
- </view>
- </view>
- <view class="rework_qd_item">
- <text><b>*</b>鍏ュ簱鏁伴噺<template v-if="item.unitName">({{ item.unitName }})</template></text>
- <view class="rework_qd_item_right">
- <u--input placeholder="0" inputAlign="right" :customStyle="{width: '230rpx'}" border="surround" v-model="item.num"></u--input>
- </view>
- </view>
- </view>
- </u-swipe-action-item>
- </u-swipe-action>
- </view>
- <view class="rework_zw"></view>
- <!-- 搴曢儴鎿嶄綔鎸夐挳 -->
- <view class="rework_footer">
- <button class="rework_footer_submit" @click="onConfirm()">鎻愪氦</button>
- </view>
- <u-toast ref="uToast"></u-toast>
- <!-- 浠撳簱 -->
- <Warehouse :show="warehouseShow" @close="close" @value="getValue" />
- <!-- 鐗╂枡 -->
- <Material :show="materialsShow" @close="close1" @value="getValue1" />
- <!-- 璐т綅 -->
- <location :show="locationShow" :list="locationList" @close="close3" @value="getValue3" />
- <!-- 宸ュ簭 -->
- <ProductionProcess :show="productionShow" :list="productionList" @close="productionShow = false" @value="getValue4" />
- <!-- 鍗曟嵁绫诲瀷 -->
- <u-picker :show="typeShow" keyName="name" :columns="typeList" @confirm="confirm" @cancel="typeClose"></u-picker>
- <!-- 璐ㄩ噺灞炴�� -->
- <u-picker :show="qualityShow" :columns="columns" @cancel="qualityShow = false" keyName="name" @confirm="onConfirm1"></u-picker>
- </view>
-</template>
-
-<script>
- import Warehouse from '../../components/Warehouse.vue'
- import location from '../../components/location.vue'
- import Material from '../../components/Material.vue'
- import ProductionProcess from '../../components/ProductionProcess.vue'
- import { getListByWarehouseId, wOutBoundForStockUp } from '@/util/api/WorkOrderAPI'
- import { getListByMaterialId } from '@/util/api/ExWarehouse'
- export default {
- components: { Warehouse, location, Material, ProductionProcess },
- data() {
- return {
- i: 0,
- form: {
- warehouseName: '',
- warehouseId: '',
- type: '',
- typeName: ''
- },
- locationList: [],
- productionList: [],
- columns: [
- [
- { name: '鍚堟牸', id: '0' },
- { name: '涓嶈壇', id: '1' },
- { name: '鎶ュ簾', id: '2' }
- ]
- ],
- list: [
- {
- batch: '',
- locationId: '',
- locationIdLabel: '',
- locationName: '',
- materialId: '',
- materialName: '',
- num: '',
- hasBom: '',
- procedureId: '',
- procedureName: '',
- qualityType: '',
- qualityTypeName: '',
- unitId: '',
- unitName: '',
- options: [
- {
- text: '鍒犻櫎',
- style: {
- backgroundColor: '#f56c6c'
- }
- }
- ]
- }
- ],
- typeList: [[{name: '閲囪喘鍏ュ簱', id: 25}, {name: '搴撳瓨璋冩暣', id: 28}]],
- warehouseShow: false,
- typeShow: false,
- locationShow: false,
- materialsShow: false,
- productionShow: false,
- qualityShow: false
- };
- },
- methods: {
- dele(e, index) {
- if (this.list.length === 1) return uni.showToast({ title: '璇烽�夋嫨鍗曟嵁绫诲瀷', icon: 'none', duration: 2000 });
- this.list.splice(index, 1)
- },
- // 閫夋嫨宸ュ簭
- getValue4(item) {
- this.list[this.i].procedureId = item.id
- this.list[this.i].procedureName = item.name
- this.productionShow = false
- },
- // 鎻愪氦
- onConfirm() {
- if (!this.form.type) return uni.showToast({ title: '璇烽�夋嫨鍗曟嵁绫诲瀷', icon: 'none', duration: 2000 });
- if (!this.form.warehouseId) return uni.showToast({ title: '璇烽�夋嫨鍏ュ簱浠撳簱', icon: 'none', duration: 2000 });
- if (this.list.length === 0) return uni.showToast({ title: '璇峰厛娣诲姞鍏ュ簱鐗╂枡', icon: 'none', duration: 2000 });
- for (let i = 0; i < this.list.length; i++) {
- if (!this.list[i].locationId) return uni.showToast({ title: `绗�${i+1}椤瑰叆搴撹揣浣嶄笉鑳戒负绌篳, icon: 'none', duration: 2000 });
- if (!this.list[i].materialId) return uni.showToast({ title: `绗�${i+1}椤瑰叆搴撶墿鏂欎笉鑳戒负绌篳, icon: 'none', duration: 2000 });
- if (!this.list[i].qualityType) return uni.showToast({ title: `绗�${i+1}椤硅川閲忓睘鎬т笉鑳戒负绌篳, icon: 'none', duration: 2000 });
- if (!this.list[i].batch) return uni.showToast({ title: `绗�${i+1}椤规壒娆″彿涓嶈兘涓虹┖`, icon: 'none', duration: 2000 });
- if (this.list[i].num <= 0) {
- return uni.showToast({ title: `绗�${i + 1}椤瑰叆搴撴暟閲忓繀椤诲ぇ浜�0`, icon: 'none', duration: 2000 });
- }
- }
- wOutBoundForStockUp({
- type: this.form.type,
- planDate: this.getDay(),
- validDate: this.getDay(),
- warehouseId: this.form.warehouseId,
- woutboundInBodyBeanList: this.list
- }).then(res => {
- if (res.code === 200) {
- uni.showToast({ title: '鍏ュ簱鎴愬姛', icon: 'success', duration: 2000 });
- setTimeout(() => {
- uni.navigateBack({ delta: 1 });
- }, 2000)
- }
- })
- },
- // 鑾峰彇褰撳ぉ骞存湀鏃�
- getDay() {
- var date = new Date();
- var year = date.getFullYear();
- var month = date.getMonth() + 1;
- var day = date.getDate();
- return `${year}-${month <= 9 ? `0${month}` : month}-${day <= 9 ? `0${day}` : day}`
- },
- // 鎵撳紑閫夋嫨鐗╂枡
- openQ(index) {
- if (this.list[index].locationIdLabel == 'APPLIANCE_ONTEST' || this.list[index].locationIdLabel == 'APPLIANCE_OFFTEST' || this.list[index].locationIdLabel == 'APPLIANCE_USELESS') {
- return
- }
- this.i = index
- this.qualityShow = true
- },
- // 鎵撳紑宸ュ簭
- openGX(index) {
- if (!this.list[index].materialId) return uni.showToast({ title: '璇峰厛閫夋嫨鍏ュ簱鐗╂枡', icon: 'none', duration: 2000 });
- this.i = index
- this.productionShow = true
- },
- // 鎵撳紑閫夋嫨璐т綅
- openL(index) {
- if (!this.form.warehouseId) return uni.showToast({ title: '璇烽�夋嫨鍏ュ簱浠撳簱', icon: 'none', duration: 2000 });
- this.i = index
- this.locationShow = true
- },
- // 鎵撳紑閫夋嫨鐗╂枡
- openMaterial(index) {
- this.i = index
- this.materialsShow = true
- },
- // 璐ㄩ噺灞炴�х‘璁�
- onConfirm1(value) {
- this.list[this.i].qualityType = value.value[0].id
- this.list[this.i].qualityTypeName = value.value[0].name
- this.qualityShow = false
- },
- // 閫夋嫨鐗╂枡
- getValue1(item) {
- this.list[this.i].materialName = item.mmodelUnionName
- this.list[this.i].materialId = item.id
- this.list[this.i].unitId = item.unitId
- this.list[this.i].hasBom = item.hasBom
- this.list[this.i].unitName = item.umodelName
- // 鑾峰彇鐗╂枡涓嬪伐搴�
- getListByMaterialId({
- materialId: item.id
- }).then(res => {
- if (res.code === 200) {
- this.productionList = res.data
- this.list[this.i].procedureId = ''
- this.list[this.i].procedureName = ''
- }
- })
- this.materialsShow = false
- },
- // 鍏抽棴浠撳簱閫夋嫨寮规
- close1() {
- this.materialsShow = false
- },
- // 閫夋嫨璐т綅
- getValue3(item) {
- this.list[this.i].locationId = item.id
- this.list[this.i].locationName = item.unionName
- this.list[this.i].qualityType = ''
- this.list[this.i].qualityTypeName = ''
- this.list[this.i].locationIdLabel = item.label
- if (item.label === 'APPLIANCE_ONTEST') {
- this.list[this.i].qualityType = '0'
- this.list[this.i].qualityTypeName = '鍚堟牸'
- } else if (item.label === 'APPLIANCE_OFFTEST') {
- this.list[this.i].qualityType = '1'
- this.list[this.i].qualityTypeName = '涓嶈壇'
- } else if (item.label === 'APPLIANCE_USELESS') {
- this.list[this.i].qualityType = '2'
- this.list[this.i].qualityTypeName = '鎶ュ簾'
- }
- this.locationShow = false
- },
- // 鍏抽棴璐т綅閫夋嫨寮规
- close3() {
- this.locationShow = false
- },
- // 纭鍗曟嵁绫诲瀷
- confirm(val) {
- this.form.type = val.value[0].id
- this.form.typeName = val.value[0].name
- if (val.value[0].id == 25) {
- this.list.forEach(item => {
- item.procedureId = ''
- item.procedureName = ''
- })
- }
- this.typeShow = false
- },
- // 浠撳簱纭
- getValue(val) {
- this.form.warehouseName = val.name
- this.form.warehouseId = val.id
- getListByWarehouseId({ wareHouseId: val.id })
- .then(res => {
- if (res.code === 200) {
- this.locationList = res.data
- if (res.data.length === 1) {
- this.location = false
- this.list.forEach(item => {
- item.locationId = res.data[0].id
- item.locationName = res.data[0].unionName
- })
- this.list[this.i].locationIdLabel = res.data[0].label
- if (res.data[0].label === 'APPLIANCE_ONTEST') {
- this.list[this.i].qualityType = '0'
- this.list[this.i].qualityTypeName = '鍚堟牸'
- } else if (res.data[0].label === 'APPLIANCE_OFFTEST') {
- this.list[this.i].qualityType = '1'
- this.list[this.i].qualityTypeName = '涓嶈壇'
- } else if (res.data[0].label === 'APPLIANCE_USELESS') {
- this.list[this.i].qualityType = '2'
- this.list[this.i].qualityTypeName = '鎶ュ簾'
- }
- } else {
- this.location = true
- this.list.forEach(item => {
- item.locationId = res.data[0].id
- item.locationName = res.data[0].unionName
- })
- }
- }
- })
- this.warehouseShow = false
- },
- typeClose() {
- this.typeShow = false
- },
- close() {
- this.warehouseShow = false
- },
- // 娣诲姞鏄庣粏
- addItem() {
- if (!this.form.warehouseId) return this.$refs.uToast.show({ type: 'default', message: "璇烽�夋嫨鍏ュ簱浠撳簱" })
- this.list.unshift({
- batch: '',
- locationId: this.list[this.list.length - 1].locationId,
- locationName: this.list[this.list.length - 1].locationName,
- locationIdLabel: this.list[this.list.length - 1].locationIdLabel,
- materialId: '',
- materialName: '',
- num: '',
- hasBom: '',
- procedureId: '',
- procedureName: '',
- qualityType: this.list[this.list.length - 1].qualityType,
- qualityTypeName: this.list[this.list.length - 1].qualityTypeName,
- unitId: '',
- unitName: '',
- options: [
- {
- text: '鍒犻櫎',
- style: {
- backgroundColor: '#f56c6c'
- }
- }
- ]
- })
- }
- }
- }
-</script>
-<style>
- .u-swipe-action-item__right {
- z-index: 9;
- }
-</style>
-<style lang="scss" scoped>
- .rework {
- width: 100%;
- min-height: 100vh;
- background-color: #F7F7F7;
- .rework_list {
- display: flex;
- flex-direction: column;
- background: #ffffff;
- padding: 0 30rpx;
- box-sizing: border-box;
- .rework_list_item {
- display: flex;
- align-items: center;
- justify-content: space-between;
- height: 98rpx;
- border-bottom: 1rrpx solid #E5E5E5;
- &:last-child {
- border: none;
- }
- text {
- font-size: 30rpx;
- font-weight: 400;
- color: #222222;
- flex-shrink: 0;
- b {
- font-size: 30rpx;
- color: red;
- margin-right: 5rpx;
- }
- }
- .rework_list_item_right {
- flex: 1;
- display: flex;
- align-items: center;
- justify-content: flex-end;
- text {
- font-size: 28rpx;
- font-weight: 400;
- color: #999999;
- }
- .black {
- color: black !important;
- }
- input {
- width: 230rpx;
- height: 60rpx;
- font-size: 28rpx;
- border-radius: 8rpx;
- padding: 0 30rpx;
- text-align: right;
- box-sizing: border-box;
- border: 1rpx solid #CCCCCC;
- }
- input::-webkit-input-placeholder {
- font-size: 28rpx;
- font-weight: 400;
- color: #B2B2B2;
- }
- }
- }
- }
- .rework_qd {
- margin-top: 40rpx;
- width: 100%;
- background: #F7F7F7;
- .rework_qd_title {
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding: 0 30rpx 30rpx 30rpx;
- .rework_qd_title_left {
- display: flex;
- align-items: center;
- text {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
- }
- .x {
- width: 8rpx;
- height: 30rpx;
- background: #4275FC;
- border-radius: 2rpx;
- margin-right: 12rpx;
- }
- }
- .rework_qd_title_right {
- display: flex;
- align-items: center;
- image {
- width: 28rpx;
- height: 28rpx;
- margin-right: 12rpx;
- }
- text {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #4275FC;
- }
- }
- }
- .rework_qd_list {
- display: flex;
- flex-direction: column;
- padding: 0 30rpx;
- background: #FFFFFF;
- box-sizing: border-box;
- margin-bottom: 30rpx;
- .rework_qd_item {
- display: flex;
- align-items: center;
- justify-content: space-between;
- height: 98rpx;
- border-bottom: 1rpx solid #E5E5E5;
- &:last-child {
- border: none;
- }
- text {
- font-size: 30rpx;
- font-weight: 400;
- color: #222222;
- flex-shrink: 0;
- b {
- font-size: 30rpx;
- color: red;
- margin-right: 5rpx;
- }
- }
- .rework_qd_item_right {
- display: flex;
- align-items: center;
- text {
- font-size: 28rpx;
- font-weight: 400;
- color: #999999;
- }
- .black {
- color: black !important;
- }
- input {
- width: 230rpx;
- height: 60rpx;
- font-size: 28rpx;
- border-radius: 8rpx;
- padding: 0 30rpx;
- text-align: right;
- box-sizing: border-box;
- border: 1rpx solid #CCCCCC;
- }
- input::-webkit-input-placeholder { /* WebKit browsers */
- font-size: 28rpx;
- font-weight: 400;
- color: #B2B2B2;
- }
- }
- }
- }
- }
- .rework_zw {
- height: 168rpx;
- }
- .rework_footer {
- width: calc(100% - 60rpx);
- position: fixed;
- bottom: 0;
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding: 0 30rpx 68rpx 30rpx;
- .rework_footer_add {
- flex: 1;
- height: 88rpx;
- font-size: 30rpx;
- font-weight: 500;
- color: $nav-color;
- background: #FFFFFF;
- box-shadow: 0 0 12rpx 0 rgba(0,0,0,0.0800);
- border-radius: 8rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- .rework_footer_submit {
- flex: 1;
- height: 88rpx;
- font-size: 30rpx;
- font-weight: 500;
- color: #ffffff;
- background: $nav-color;
- box-shadow: 0 0 12rpx 0 rgba(0,0,0,0.0800);
- border-radius: 8rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- border: none;
- }
- }
- }
-</style>
diff --git a/minipro_standard/pages_adjust/pages/forgotPassword/forgotPassword.vue b/minipro_standard/pages_adjust/pages/forgotPassword/forgotPassword.vue
deleted file mode 100644
index e4f204f..0000000
--- a/minipro_standard/pages_adjust/pages/forgotPassword/forgotPassword.vue
+++ /dev/null
@@ -1,168 +0,0 @@
-<template>
- <view class="password">
- <view class="password_tip">
- <image src="@/static/password_ic_tip@2x.png" alt="" />
- <text>瀵嗙爜鐢�6-20涓嫳鏂囧瓧姣嶃�佹暟瀛楁垨绗﹀彿缁勬垚</text>
- </view>
- <view class="password_list">
- <view class="password_list_item">
- <text>褰撳墠缁戝畾</text>
- <view class="password_list_item_box">
- <input type="number" disabled v-model="userInfo.companyUser.phone" maxlength="11">
- </view>
- </view>
- <view class="password_list_item">
- <text>楠岃瘉鐮�</text>
- <view class="password_list_item_box">
- <input type="text" v-model="form.verificationCode" maxlength="4" placeholder="璇疯緭鍏ユ墜鏈洪獙璇佺爜">
- <p @click="getVerificationCode" v-if="!code.isOpen">鑾峰彇楠岃瘉鐮�</p>
- <p v-else>{{code.num}}</p>
- </view>
- </view>
- <view class="password_list_item">
- <text>鏂板瘑鐮�</text>
- <view class="password_list_item_box">
- <input type="text" v-model="form.newPhone" maxlength="11" placeholder="璇疯緭鍏ユ柊瀵嗙爜">
- </view>
- </view>
- <view class="password_list_item">
- <text>纭瀵嗙爜</text>
- <view class="password_list_item_box">
- <input type="text" v-model="form.newPhone" maxlength="11" placeholder="鍐嶆杈撳叆鏂板瘑鐮�">
- </view>
- </view>
- </view>
- <view class="password_footer">
- <button v-preventReClick class="password_footer_submit" @click="submit">
- <text>瀹屾垚</text>
- </button>
- </view>
- </view>
-</template>
-
-<script>
- import { mapState } from 'vuex'
- import { phoneRegular } from '@/common/config.js'
- export default {
- data() {
- return {
- form: {
- newPhone: '',
- verificationCode: ''
- },
- code: {
- num: 60,
- isOpen: false,
- timer: 0
- }
- };
- },
- computed: mapState([
- 'userInfo'
- ]),
- methods: {
- // 鑾峰彇楠岃瘉鐮�
- getVerificationCode() {
- this.code.isOpen = true
- this.code.timer = setInterval(() => {
- if (this.code.num === 0) {
- clearInterval(this.code.timer)
- this.code.isOpen = false
- this.code.num = 60
- }
- this.code.num = this.code.num - 1
- }, 1000)
- },
- // 鎻愪氦淇敼
- submit() {
- // if (!this.form.newPhone) {
- // uni.showToast({ title: '鏂版墜鏈哄彿涓嶈兘涓虹┖', icon: 'none', duration: 2000 });
- // } else if (!phoneRegular.test(this.form.newPhone)) {
- // uni.showToast({ title: '鎵嬫満鍙蜂笉鍚堟硶', icon: 'none', duration: 2000 });
- // } else if (!this.form.verificationCode) {
- // uni.showToast({ title: '楠岃瘉鐮佷笉鑳戒负绌�', icon: 'none', duration: 2000 });
- // } else {
- // console.log('鍙互鎻愪氦')
- // }
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .password {
- width: 100%;
- .password_tip {
- padding: 20rpx 30rpx;
- display: flex;
- background: #F7F7F7;
- box-sizing: border-box;
- image {
- width: 24rpx;
- height: 24rpx;
- margin-right: 10rpx;
- margin-top: 8rpx;
- }
- text {
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- }
- }
- .password_list {
- padding: 0 30rpx;
- .password_list_item {
- display: flex;
- align-items: center;
- height: 90rpx;
- border-bottom: 1rpx solid #E5E5E5;
- text {
- width: 150rpx;
- flex-shrink: 0;
- font-size: 30rpx;
- font-weight: 400;
- color: #222222;
- }
- .password_list_item_box {
- display: flex;
- justify-content: space-between;
- flex: 1;
- input {
- border: none;
- font-size: 30rpx;
- }
- input::-webkit-input-placeholder {
- font-size: 28rpx;
- font-weight: 400;
- color: #B2B2B2;
- }
- p {
- font-size: 26rpx;
- font-weight: 400;
- color: #4275FC;
- }
- }
- }
- }
- .password_footer {
- margin-top: 80rpx;
- padding: 0 30rpx;
- .password_footer_submit {
- width: 100%;
- height: 88rpx;
- border: none;
- background: #4275FC;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- text {
- font-size: 30rpx;
- font-weight: 500;
- color: #FFFFFF;
- }
- }
- }
- }
-</style>
diff --git a/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue b/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue
deleted file mode 100644
index 193ae5d..0000000
--- a/minipro_standard/pages_adjust/pages/manualFeed/manualFeed.vue
+++ /dev/null
@@ -1,396 +0,0 @@
-<template>
- <view class="tl">
- <workOrderInfo :orederMessage="info" />
- <div class="tl_title">
- <div class="tl_title_left">
- <div class="tl_title_left_x"></div>
- <span>鎶曟枡淇℃伅</span>
- <!-- <span>{{total == 0 ? '' : total}}{{formList[formList.length - 1].dw ? formList[formList.length - 1].dw : ''}}</span> -->
- <!-- <span>{{total == 0 ? '' : total}}{{formList[formList.length - 1].dw ? formList[formList.length - 1].dw : ''}}</span> -->
- </div>
- <div class="tl_title_right" @click="add">
- <image src="../../static/gongdan_ic_shoudong@2x.png" class="add-img" mode=""></image>
- <span>澧炲姞鎶曟枡</span>
- </div>
- </div>
- <u-swipe-action>
- <u-swipe-action-item v-for="(item, index) in materialList" :key="index" :options="options"
- @click="deleItem(index)">
- <div class="tl_list">
- <div class="tl_list_item" @click="open1(index)">
- <div class="tl_list_item_label">閫夋嫨鐗╂枡</div>
- <div class="tl_list_item_go" v-if="!item.materialName">
- <span>鐐瑰嚮璺宠浆鍒扮墿鏂欏垪琛�</span>
- <u-icon name="arrow-right"></u-icon>
- </div>
- <div class="tl_list_item_wl" v-else>
- <div class="tl_list_item_wl_top">
- <span>{{ item.materialName }}</span>
- <span> | {{ item.materialCode }}</span>
- </div>
- <div class="tl_list_item_wl_bottom">
- <span class="green" v-if="item.qualityType == 0">鍚堟牸</span>
- <span class="yellow" v-else-if="item.qualityType == 1">涓嶈壇</span>
- <span class="red" v-else-if="item.qualityType == 2">鎶ュ簾</span>
- <span>{{ item.procedureName ? ` / ${item.procedureName}` : ' / -' }}</span>
- <span>{{ item.locationName ? ` / ${item.locationName}` : ' / -' }}</span>
- <span>{{ item.batch ? ` / ${item.batch}` : ' / -' }}</span>
- </div>
- </div>
- </div>
- <div class="tl_list_item">
- <div class="tl_list_item_label">鎶曟枡鏁伴噺{{ item.unitAttribute }}</div>
- <div class="tl_list_item_go">
- <input type="text" @blur="changeNumber(item.num, index, item.unitAttribute)"
- v-model="item.num" />
- </div>
- </div>
- </div>
- </u-swipe-action-item>
- </u-swipe-action>
- <view class="" style="height: 88rpx;"></view>
- <u-safe-bottom></u-safe-bottom>
- <div class="tl_footer">
- <button class="tl_footer_submit" v-preventReClick @click="submit">鎻愪氦</button>
- </div>
- <SelectMaterial ref="selectMaterial" @selectAction="getValue" />
- <!-- <SelectMultipleMaterial ref="selectMultipleMaterial" @selected="getMaterails"/> -->
- </view>
-</template>
-
-<script>
- import workOrderInfo from '@/components/workOrderInfo.vue'
- import SelectMaterial from '@/components/selectMaterial.vue'
- // import SelectMultipleMaterial from '@/components/SelectMultipleMaterial.vue'
- import {
- queryById,
- createMaterial,
- createMaterialStandard
- } from '@/util/api/WorkOrderAPI'
- import {
- positiveInteger,
- number
- } from '@/common/config'
- export default {
- components: {
- workOrderInfo,
- SelectMaterial,
- // SelectMultipleMaterial
- },
- data() {
- return {
- deviceId: '',
- workorderId: '',
- // formList: [{
- // id: Date.now(),
- // toolingTypeId: '', // 宸ヨ绫诲瀷
- // toolingTypeName: '', // 宸ヨ绫诲瀷鍚嶇О
- // workClothesId: '', // 宸ヨ
- // workClothesName: '', // 宸ヨ鍚嶇О
- // num: '', // 鏁伴噺
- // attribute: '', // 宸ヨ灞炴��
- // attributeType: '', // 宸ヨ灞炴�х被鍨�
- // dw: '', // 鐗╂枡鍗曚綅
- // unitAttribute: ''
- // }],
- info: {},
- materialList: [{
- id: '',
- materialName: '',
- materialCode: '',
- qualityType: '',
- procedureName: '',
- locationName: '',
- batch: '',
- num: '',
- unitAttribute: ''
- }],
- options: [{
- text: '鍒犻櫎',
- style: {
- backgroundColor: 'red',
- }
- }],
- };
- },
- onLoad(obj) {
- this.workorderId = obj.id
- queryById(this.workorderId)
- .then(res => {
- if (res.code === 200) {
- this.info = res.data
- this.deviceId = res.data.pgmodel.id
- }
- })
- },
- methods: {
- open1(index) {
- // this.$refs.selectMaterial.open({})
- this.index = index
- this.$refs.selectMaterial.open({
- workorderId: this.workorderId,
- deviceId: this.deviceId
- })
- },
- deleItem(index) {
- if (this.materialList.length === 1) {
- uni.$u.toast('鑷冲皯淇濈暀涓�鏉℃姇鏂欎俊鎭�')
- return
- }
- this.materialList.splice(index, 1)
- },
- add() {
- this.total += 1
- this.materialList.unshift({
- id: '',
- materialName: '',
- materialCode: '',
- qualityType: '',
- procedureName: '',
- locationName: '',
- batch: '',
- num: '',
- unitAttribute: ''
- })
- },
- changeNumber(num, index, unitAttribute) {
-
- if (unitAttribute === 0 && num !== '') {
- if (!positiveInteger.test(num)) {
- uni.$u.toast('鍙兘杈撳叆姝ｆ暣鏁�')
- this.materialList[index].num = ''
- }
- } else if (unitAttribute === 1 && num !== '') {
- if (!number.test(num)) {
- uni.$u.toast('鍙兘杈撳叆姝ｆ暣鏁版垨灏忔暟锛堟渶澶氬洓浣嶏級')
- this.materialList[index].num = ''
- }
- }
- if (num <= 0) {
- uni.$u.toast('鎶曟枡鏁伴噺涓嶈兘灏忎簬绛変簬0')
- this.materialList[index].num = ''
- }
- },
- getValue(item) {
- for (let i = 0; i < this.materialList.length; i++) {
- if (item.id === this.materialList[i].id) {
- uni.$u.toast('涓嶈兘閲嶅閫夋嫨鐩稿悓鐗╂枡')
- return
- }
- }
- this.materialList[this.index].id = item.id
- this.materialList[this.index].materialName = item.materialName
- this.materialList[this.index].num = item.num
- this.materialList[this.index].batch = item.batch
- this.materialList[this.index].locationName = item.locationName
- this.materialList[this.index].materialCode = item.materialCode
- this.materialList[this.index].procedureName = item.procedureName
- this.materialList[this.index].qualityType = item.qualityType
- this.materialList[this.index].unitAttribute = item.unitAttribute
- },
- submit() {
- let temp = this.materialList.findIndex(item => !item.id || !item.num)
- if (temp != -1) {
- uni.$u.toast(`璇峰厛瀹屽杽绗�${temp + 1}鏉℃姇鏂欎俊鎭痐)
- return
- }
- let total = this.materialList.reduce((accumulator, currentValue) => accumulator + Number(currentValue.num),
- 0)
- console.log(total);
- if (this.info.bomType != 1 && this.info.hasBom != 1) {
- if (total > this.info.planNum) {
- uni.$u.toast(`鎶曟枡鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺`)
- return
- }
- }
- let recordList = this.materialList.map(item => {
- return {
- wstockId: item.id,
- num: item.num
- }
- })
- createMaterialStandard({
- id: this.workorderId,
- recordList
- }).then(res => {
- if (res.code === 200) {
- // Toast.success({ message: '鎶曟枡鎴愬姛', duration: 2000, forbidClick: true })
- // setTimeout(() => {
- // router.go(-1)
- // }, 2000)
- uni.$u.toast(`鎶曟枡鎴愬姛`)
- uni.$emit('addMaterial')
- uni.navigateBack()
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss">
- .tl {
- width: 100%;
- height: 100%;
- position: absolute;
- background: #F7F7F7;
-
- .tl_title {
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding: 30rpx;
-
- .tl_title_left {
- display: flex;
- align-items: center;
-
- .tl_title_left_x {
- width: 8rpx;
- height: 30rpx;
- background: $nav-color;
- border-radius: 2rpx;
- margin-right: 12rpx;
- }
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
-
- &:nth-child(3) {
- font-size: 28rpx;
- font-weight: 500;
- color: $nav-color;
- margin-left: 10rpx;
- }
- }
- }
-
- .tl_title_right {
- display: flex;
- align-items: center;
-
- .add-img {
- width: 28rpx;
- height: 28rpx;
- margin-right: 12rpx;
- }
-
- span {
- font-size: 28rpx;
- font-weight: 400;
- // color: $nav-color;
- }
- }
- }
-
- .tl_list {
- display: flex;
- flex-direction: column;
- background: white;
- padding: 0 30rpx;
- margin-bottom: 20rpx;
-
- .tl_list_item {
- min-height: 98rpx;
- // padding: 20rpx 0;
- box-sizing: border-box;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
-
- &:last-child {
- border: none !important;
- }
-
- .tl_list_item_label {
- font-size: 30rpx;
- font-weight: 400;
- color: #222222;
- }
-
- .tl_list_item_wl {
- display: flex;
- flex-direction: column;
- align-items: end;
-
- .tl_list_item_wl_top {
- display: flex;
- align-items: center;
-
- span {
- font-size: 28rpx;
- color: #222222;
- }
- }
-
- .tl_list_item_wl_bottom {
- display: flex;
- align-items: center;
-
- span {
- font-size: 28rpx;
- color: #222222;
- }
- }
- }
-
- .tl_list_item_go {
- display: flex;
- align-items: center;
-
- input {
- text-align: right;
- width: 180rpx;
- height: 60rpx;
- border-radius: 8rpx;
- border: 1rpx solid #E5E5E5;
- padding: 0 30rpx;
- box-sizing: border-box;
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
- }
-
- span {
- font-size: 28rpx;
- font-weight: 400;
- color: #999999;
- margin-right: 10rpx;
- }
- }
- }
- }
-
- .tl_zw {
- height: 160rpx;
- }
-
- .tl_footer {
- width: 100%;
- position: fixed;
- bottom: 0;
- padding: 0 30rpx calc(env(safe-area-inset-bottom) + 20rpx);
- box-sizing: border-box;
- z-index: 999;
- background-color: #fff;
-
- .tl_footer_submit {
- width: 690rpx;
- height: 88rpx;
- border: none;
- background: #4275FC;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- font-size: 30rpx;
- font-weight: 500;
- color: #FFFFFF;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- }
-</style>
diff --git a/minipro_standard/pages_adjust/pages/newTransfer/newTransfer.vue b/minipro_standard/pages_adjust/pages/newTransfer/newTransfer.vue
deleted file mode 100644
index f769c68..0000000
--- a/minipro_standard/pages_adjust/pages/newTransfer/newTransfer.vue
+++ /dev/null
@@ -1,454 +0,0 @@
-<template>
- <view class="zk">
- <view class="zk_list">
- <view class="zk_list_item" @click="open('d')">
- <text>鍗曟嵁绫诲瀷</text>
- <view class="zk_list_item_n">
- <text :style="data.typeName ? 'color: black;' : ''">{{data.typeName ? data.typeName : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#999999" size="20"></u-icon>
- </view>
- </view>
- <view class="zk_list_item" @click="open('c')">
- <text>鍑哄簱浠撳簱</text>
- <view class="zk_list_item_n">
- <text :style="data.exWarehouse ? 'color: black;' : ''">{{data.exWarehouse ? data.exWarehouse : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#999999" size="20"></u-icon>
- </view>
- </view>
- <view class="zk_list_item" @click="open('r')">
- <text>鍏ュ簱浠撳簱</text>
- <view class="zk_list_item_n">
- <text :style="data.warehousingWarehouseName ? 'color: black;' : ''">{{data.warehousingWarehouseName ? data.warehousingWarehouseName : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#999999" size="20"></u-icon>
- </view>
- </view>
- </view>
- <view class="zk_title">
- <view class="zk_title_i"></view>
- <text>杞嚭鐗╂枡鍒楄〃</text>
- </view>
- <view class="zk_wl">
- <template v-if="view.MaterialList.length > 0">
- <view class="zk_wl_item" v-for="(item, i) in view.MaterialList" :key="i">
- <image class="shanchu" src="@/static/chuku_ic_delete@2x.png" mode="widthFix" @click="dele(i)"></image>
- <text class="material-title">{{item.materialName}}锝渰{item.materialCode}}</text>
- <text class="material-att">
- <text class="green" v-if="item.qualityType === '0'" decode>鍚堟牸<text class="c6" decode>{{ division }}</text></text>
- <text class="yellow" v-if="item.qualityType === '1'" decode>涓嶈壇<text class="c6" decode>{{ division }}</text></text>
- <text class="red" v-if="item.qualityType === '2'" decode>鎶ュ簾<text class="c6" decode>{{ division }}</text></text>
- <text decode>{{item.procedureName ? item.procedureName : '-'}}{{division}}</text>
- <text>{{item.batch ? item.batch : '-'}}</text>
- </text>
- <view class="zk_wl_item_num">
- <text>璐т綅锛歿{item.locationName}}</text>
- <view class="zk_wl_item_input">
- <text>鏁伴噺锛�</text>
- <input type="number" v-model="item.total" placeholder="0" />
- <text>{{item.unitName}}</text>
- </view>
- </view>
- </view>
- </template>
- <view class="zk_wl_w" v-else>
- <text>鏆傛棤鏁版嵁</text>
- </view>
- </view>
- <view class="zk_z"></view>
- <view class="zk_footer">
- <view class="zk_footer_wl" @click="open('w')">閫夋嫨鐗╂枡</view>
- <view style="width: 20rpx"></view>
- <view class="zk_footer_submit" @click="submit">鎻愪氦</view>
- </view>
- <!-- 閫夋嫨浠撳簱 -->
- <Warehouse :show="view.Warehouse" @close="view.Warehouse = false" @value="getValue" />
- <!-- 閫夋嫨鐗╂枡 -->
- <multipleMaterial
- :warehouseId="data.exWarehouseId.toString()"
- :warehouseQualityType="view.warehouseQualityType"
- :selected="view.MaterialList.map(item => item.id)"
- @value="getValueWL"
- ref="multipleMaterial" />
- <!-- 鍗曟嵁绫诲瀷 -->
- <u-picker :show="view.type" :columns="view.documentTypeDate" keyName="name" @cancel="onCancel" @confirm="onConfirm"></u-picker>
- </view>
-</template>
-
-<script>
- import { setTime } from '@/util/utils.js'
- import { documentType } from '@/util/constData.js'
- import multipleMaterial from '../../components/multipleMaterial.vue'
- import Warehouse from '../../components/Warehouse.vue'
- import { createZK } from '@/util/api/agencyAPI'
-
- export default {
- components: {
- multipleMaterial,
- Warehouse
- },
- data() {
- return {
- division: ' / ',
- data: {
- type: '',
- outUserId: '',
- inUserId: '',
- typeName: '',
- exWarehouse: '',
- exWarehouseId: '',
- warehousingWarehouse: '',
- warehousingWarehouseName: ''
- },
- view: {
- type: false,
- Warehouse: false,
- Material: false,
- status: '',
- MaterialList: [],
- documentTypeDate: [
- [
- { name: '杞﹂棿棰嗘枡', id: 1 },
- { name: '杞﹂棿杞簱', id: 5 },
- { name: '澶栧崗棰嗘枡杞簱', id: 6 },
- { name: '澶栧崗瀹屽伐杞簱', id: 7 },
- { name: '浜у搧鍏ュ簱', id: 8 },
- { name: '浜у搧杞簱', id: 9 },
- { name: '璁╂鏀捐鍏ュ簱', id: 10 },
- { name: '璁╂鏀捐杞簱', id: 11 },
- { name: '瀹㈣繑杩斾慨棰嗘枡', id: 12 },
- { name: '瀹㈣繑杩斾慨鍏ュ簱', id: 13 },
- { name: '璺ㄧ粍缁囪浆搴�', id: 14 },
- { name: '瀹㈤��杩斾慨棰嗘枡', id: 16 },
- { name: '瀹㈤��杩斾慨鍏ュ簱', id: 17 },
- { name: '搴熷搧鍏ュ簱', id: 30 }
- ]
- ],
- warehouseQualityType: ''
- }
- };
- },
- methods: {
- // 鍒犻櫎鐗╂枡
- dele(i) {
- this.view.MaterialList.splice(i, 1)
- },
- // 浠撳簱鍥炶皟
- getValue(val) {
- if (this.view.status === 'c') {
- if (this.data.exWarehouseId !== val.id) {
- this.view.MaterialList = []
- }
- this.data.exWarehouse = val.name
- this.data.exWarehouseId = val.id
- this.data.outUserId = val.managerId
- } else if (this.view.status === 'r') {
- this.data.warehousingWarehouseName = val.name
- this.data.warehousingWarehouse = val.id
- this.data.inUserId = val.managerId
- this.view.warehouseQualityType = val.tmodel.label
- }
- this.view.Warehouse = false
- },
- // 鐗╂枡鍥炶皟
- getValueWL(val) {
- val.forEach(element => {
- element.total = element.num
- })
- this.view.MaterialList.push(...val)
- this.view.Material = false
- },
- // 纭鍗曟嵁绫诲瀷
- onConfirm(val) {
- this.data.type = val.value[0].id
- this.data.typeName = val.value[0].name
- this.view.type = false
- },
- onCancel() {
- this.view.type = false
- },
- // 鍒涘缓杞簱鍗�
- submit() {
- if (!this.data.type) return uni.showToast({ title: '鍗曟嵁绫诲瀷涓嶈兘涓虹┖', icon: 'none', duration: 2000 });
- if (!this.data.exWarehouse) return uni.showToast({ title: '鍑哄簱浠撳簱涓嶈兘涓虹┖', icon: 'none', duration: 2000 });
- if (!this.data.warehousingWarehouse) return uni.showToast({ title: '鍏ュ簱浠撳簱涓嶈兘涓虹┖', icon: 'none', duration: 2000 });
- if (this.view.MaterialList.length === 0) return uni.showToast({ title: '杞嚭鐗╂枡涓嶈兘涓虹┖', icon: 'none', duration: 2000 });
- for (let i = 0; i < this.view.MaterialList.length; i++) {
- if (!this.view.MaterialList[i].total || this.view.MaterialList[i].total <= 0) {
- uni.showToast({ title: '杞嚭鏁伴噺蹇呴』澶т簬0', icon: 'none', duration: 2000 });
- return
- }
- if (Number(this.view.MaterialList[i].total) > Number(this.view.MaterialList[i].num)) {
- uni.showToast({ title: '杞簱鐨勭墿鏂欐暟閲忎笉鑳藉ぇ浜庡簱瀛橀噺锛�', icon: 'none', duration: 2000 });
- return
- }
- }
- let time = setTime(new Date(), '-')
- let wtransferDetailBeanList = []
- this.view.MaterialList.forEach((element) => {
- wtransferDetailBeanList.push({
- batch: element.batch,
- materialId: element.materialId,
- procedureId: element.procedureId,
- procedureName: element.procedureName,
- qualityType: element.qualityType,
- unitId: element.unitId,
- outPlanNum: element.total,
- proceduresId: element.procedureId,
- inLocationId: null,
- outLocationId: element.locationId,
- inWarehouseId: this.data.exWarehouseId,
- outWarehouseId: this.data.warehousingWarehouse
- })
- })
- createZK({
- type: this.data.type,
- outPlandate: time,
- inPlandate: time,
- origin: 0,
- outUserId: this.data.outUserId,
- inUserId: this.data.inUserId,
- inWarehouseId: this.data.warehousingWarehouse,
- outWarehouseId: this.data.exWarehouseId,
- wtransferDetailBeanList
- }).then(res => {
- if (res.code === 200) {
- uni.showToast({ title: '鍒涘缓鎴愬姛锛�', icon: 'success', duration: 2000 });
- this.$store.dispatch('getUpcomingNum')
- setTimeout(() => {
- uni.navigateBack({ delta: 1 });
- }, 2000)
- }
- })
- },
- // 鎵撳紑閫夋嫨寮规
- open(type) {
- if (type === 'd') {
- this.view.type = true
- } else if (type === 'c') {
- this.view.status = 'c'
- this.view.Warehouse = true
- } else if (type === 'r') {
- this.view.status = 'r'
- this.view.Warehouse = true
- } else if (type === 'w') {
- if (this.data.exWarehouseId) {
- if (this.data.warehousingWarehouseName) {
- // let arr = []
- // this.view.MaterialList.forEach(element => {
- // arr.push(element.id)
- // })
- // const { selected } = Material.value
- // Material.value.selected = arr
- // view.Material = true
- this.$refs.multipleMaterial.open()
- } else {
- uni.showToast({ title: '璇峰厛閫夋嫨鍏ュ簱浠撳簱', icon: 'none', duration: 2000 });
- }
- } else {
- uni.showToast({ title: '璇峰厛閫夋嫨鍑哄簱浠撳簱', icon: 'none', duration: 2000 });
- }
- }
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .zk {
- position: absolute;
- width: 100%;
-
- .zk_list {
- padding: 0 30rpx;
- background: white;
- margin-top: 20rpx;
-
- .zk_list_item {
- height: 98rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
-
- &:last-child {
- border: none !important;
- }
- text {
- font-size: 30rpx;
- font-weight: 400;
- color: #222222;
- }
- .zk_list_item_n {
- display: flex;
- align-items: center;
-
- text {
- font-size: 28rpx;
- font-weight: 400;
- color: #999999;
- margin-right: 10rpx;
- }
- }
- }
- }
-
- .zk_title {
- padding: 40rpx 30rpx 30rpx 30rpx;
- display: flex;
- align-items: center;
-
- .zk_title_i {
- width: 8rpx;
- height: 30rpx;
- background: #4275FC;
- border-radius: 2rpx;
- margin-right: 12rpx;
- }
-
- text {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
- }
- }
-
- .zk_wl {
- background: white;
-
- .zk_wl_w {
- width: 100%;
- height: 200rpx;
- background: white;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 26rpx;
- color: black;
- }
-
- .zk_wl_item {
- display: flex;
- flex-direction: column;
- padding: 30rpx;
- border-bottom: 1rpx solid #e2e2e2;
- position: relative;
-
- .shanchu {
- width: 48rpx;
- height: 48rpx;
- position: absolute;
- top: 0;
- right: 0;
- }
-
- .zk_wl_item_num {
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-top: 10rpx;
-
- .zk_wl_item_input {
- display: flex;
- align-items: center;
- text {
- font-size: 26rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #666666;
- }
- }
-
- text {
- height: 42rpx;
- font-size: 30rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #333333;
- margin: 0 !important;
- }
-
- input {
- width: 140rpx;
- height: 60rpx;
- background: #FFFFFF;
- border-radius: 8rpx;
- border: 1rpx solid #CCCCCC;
- padding: 0 30rpx;
- font-size: 28rpx;
- }
-
- input::-webkit-input-placeholder {
- font-size: 28rpx;
- font-weight: 400;
- color: #999999;
- }
- }
- .material-title {
- height: 42rpx;
- font-size: 30rpx;
- font-weight: 500;
- color: #222222;
- margin-bottom: 10rpx;
- }
- .material-att {
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
- }
- text {
- &:nth-child(1) {
- font-size: 24rpx;
- font-weight: 500;
- color: #222222;
- margin-bottom: 24rpx;
- }
- }
- }
- }
-
- .zk_z {
- height: 168rpx;
- }
-
- .zk_footer {
- width: 100%;
- box-sizing: border-box;
- padding: 0 30rpx;
- position: fixed;
- bottom: 0;
- left: 0;
- z-index: 999;
- padding-bottom: 68rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- .zk_footer_wl {
- flex: 1;
- height: 88rpx;
- background: #FFFFFF;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 30rpx;
- font-weight: 500;
- color: $nav-color;
- }
-
- .zk_footer_submit {
- flex: 1;
- height: 88rpx;
- background: $nav-color;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 30rpx;
- font-weight: 500;
- color: #FFFFFF;
- }
- }
- }
-</style>
\ No newline at end of file
diff --git a/minipro_standard/pages_adjust/pages/outboundList/outboundList.vue b/minipro_standard/pages_adjust/pages/outboundList/outboundList.vue
deleted file mode 100644
index c9575e3..0000000
--- a/minipro_standard/pages_adjust/pages/outboundList/outboundList.vue
+++ /dev/null
@@ -1,649 +0,0 @@
-<template>
- <view class="content">
- <view class="content_search">
- <Search @searchInput="searchInput" @submit="submit" @reset="reset" :isShow="true" placeholder="鎼滅储鍑哄簱鍗曞彿/鍑哄簱浠撳簱">
- <template v-slot:content>
- <view class="Search_item">
- <view class="Search_item_label">璁″垝鏃ユ湡</view>
- <view class="Search_item_content" @click="openDate">
- <view class="Search_item_content_a" :style="listData.planDateStart ? 'color: #000' : ''">
- {{ listData.planDateStart ? listData.planDateStart : '寮�濮嬫棩鏈�'}}
- </view>
- <text>-</text>
- <view class="Search_item_content_a" :style="listData.planDateEnd ? 'color: #000' : ''">
- {{ listData.planDateEnd ? listData.planDateEnd : '缁撴潫鏃ユ湡'}}
- </view>
- </view>
- </view>
- <view class="Search_item">
- <view class="Search_item_label">鍗曟嵁绫诲瀷</view>
- <view class="Search_item_content">
- <view class="tag">
- <view class="tag_item" :class="{'tag_active': item.isActive}" v-for="(item, i) in types"
- :key="item.id" @click="changeTags(i)">{{item.name}}</view>
- </view>
- </view>
- </view>
- </template>
- </Search>
- <view class="content_search_x"></view>
- <LabelSelection :TagList="tagList" :isShow="true" @change="clickTag" />
- </view>
- <view class="content_total" :style="{top: top}">鍏眥{listData.total}}鏉℃暟鎹�</view>
- <view class="content_list">
- <scroll-view
- :refresher-enabled="true"
- :refresher-triggered="isLoading"
- @refresherrefresh="onRefresh"
- refresher-background="#fff"
- @scrolltolower="getLists"
- scroll-y
- :style="{height: height}">
- <view class="content_list_item" v-for="(item, i) in lists" :key="i" @click="jump(item)">
- <!-- item澶撮儴瑙嗗浘 -->
- <view class="content_list_item_top">
- <view class="content_list_item_top_left">
- <!-- <text>杞簱鍗曞彿锛�</text>-->
- <text>{{ item.code }}</text>
- </view>
- <view class="content_list_item_top_right">
- <span class="warning" v-if="item.status === 0">寰呭嚭搴�</span>
- <span class="green" v-else-if="item.status === 1">宸插嚭搴�</span>
- <span class="info" v-else-if="item.status === 2">宸插彇娑�</span>
- </view>
- </view>
- <!-- item涓婚淇℃伅閮ㄥ垎 -->
- <view class="content_list_item_content">
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鍗曟嵁绫诲瀷锛�</view>
- <view class="content_list_item_content_item_nr">
- <!-- orderTyepToStr(item.billType) -->
- {{ seeText(item.billType) }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鍑哄簱浠撳簱锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ item.warehouseName + ' | ' + item.warehouseCode }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">璁″垝鍑哄簱锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ item.planDate }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鏉ユ簮绫诲瀷锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ tyepToStr(item.originType) }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鏉ユ簮鍗曞彿锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ item.originCode ? item.originCode : '-' }}
- </view>
- </view>
- </view>
- </view>
- </scroll-view>
- </view>
- <!-- 閫夋嫨鏃ユ湡 -->
- <!-- <u-calendar mode="range" :show="timeShow" :minDate="minDate" :maxDate="maxDate" @close="timeShow = false"
- @confirm="timeConfirm"></u-calendar> -->
- <l-calendar :lunar="false" v-model="timeShow" @change="timeConfirm" :isRange="true" activeBgColor="#305ED5"
- rangeColor="#305ED5" rangeBgColor="rgba(48, 80, 213, 0.1)"></l-calendar>
- </view>
-</template>
-
-<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"
- export default {
- components: {
- Search,
- LabelSelection
- },
- data() {
- return {
- height: '',
- top: '',
- minDate: new Date('2021-01-31'),
- maxDate: new Date(),
- listData: {
- capacity: 10,
- page: 0,
- total: 0,
- planDateEnd: "",
- planDateStart: "",
- code: "",
- originType: "",
- status: "",
- },
- types: [{
- name: '杞﹂棿棰嗘枡',
- id: '1',
- isActive: false
- },
- {
- name: '鏈哄彴澶囨枡',
- id: '2',
- isActive: false
- },
- {
- name: '杞﹂棿杞簱',
- id: '3',
- isActive: false
- },
- {
- name: '瀹屽伐鍏ュ簱',
- id: '4',
- isActive: false
- },
- {
- name: '璁″垝棰嗘枡',
- id: '5',
- isActive: false
- },
- {
- name: '澶栧崗棰嗘枡',
- id: '6',
- isActive: false
- },
- {
- name: '澶栧崗瀹屽伐杞簱',
- id: '7',
- isActive: false
- },
- {
- name: '浜у搧鍏ュ簱',
- id: '8',
- isActive: false
- },
- {
- name: '浜у搧杞簱',
- id: '9',
- isActive: false
- },
- {
- name: '璁╂鏀捐鍏ュ簱',
- id: '10',
- isActive: false
- },
- {
- name: '璁╂鏀捐杞簱',
- id: '11',
- isActive: false
- },
- {
- name: '瀹㈣繑杩斾慨棰嗘枡',
- id: '12',
- isActive: false
- },
- {
- name: '瀹㈣繑杩斾慨鍏ュ簱',
- id: '13',
- isActive: false
- },
- {
- name: '璺ㄧ粍缁囪浆搴�',
- id: '14',
- isActive: false
- },
- {
- name: '宸ュ簭鎶ュ簾',
- id: '15',
- isActive: false
- },
- {
- name: '瀹㈤��杩斾慨棰嗘枡',
- id: '16',
- isActive: false
- },
- {
- name: '瀹㈤��杩斾慨鍏ュ簱',
- id: '17',
- isActive: false
- },
- {
- name: '閿�鍞嚭搴�',
- id: '18',
- isActive: false
- },
- {
- name: '璁╂閿�鍞�',
- id: '19',
- isActive: false
- },
- {
- name: '宸ュ崟鎶曟枡',
- id: '20',
- isActive: false
- },
- {
- name: '浠撳簱鎶ュ簾',
- id: '21',
- isActive: false
- },
- {
- name: '瀹㈤��妫�楠岄鏂�',
- id: '22',
- isActive: false
- },
- {
- name: '瀹㈣繑妫�楠岄鏂�',
- id: '23',
- isActive: false
- },
- {
- name: '搴撳瓨璋冩暣',
- id: '28',
- isActive: false
- },
- {
- name: '搴熷搧鍏ュ簱',
- id: '30',
- isActive: false
- }
- ],
- tagList: [{
- id: "",
- name: "鍏ㄩ儴",
- num: '0',
- },
- {
- id: "0",
- name: "寰呭嚭搴�",
- num: '0',
- },
- {
- id: "1",
- name: "宸插嚭搴�",
- num: "0",
- },
- {
- id: "2",
- name: "宸插彇娑�",
- num: "0",
- }
- ],
- finished: false,
- isLoading: false,
- loading: false,
- refreshing: false,
- timeShow: false,
- lists: []
- };
- },
- onReady() {
- var that = this
- this.$nextTick(() => {
- uni.createSelectorQuery()
- .in(this)
- .select('.content_search')
- .boundingClientRect((rect) => {
-
- that.height = `calc(100vh - ${rect.height + 80}px)`
- that.top = `${rect.height}px`
- }).exec()
- })
- },
- onLoad() {
- this.getLists()
- this.getPageCount()
- this.listData.page = 0
- },
- methods: {
- onRefresh() {
- this.isLoading = true
- this.listData.page = 0;
- this.finished = false;
- this.lists = [];
- this.getLists();
- this.getPageCount()
- },
- seeText(id) {
- return orderTyepToStr(id)
- },
- // 缁熻鏁版嵁
- getPageCount() {
- pageCount({
- type: 0,
- codeOrHouse: this.listData.code,
- planDateEnd: this.listData.planDateEnd,
- planDateStart: this.listData.planDateStart,
- billType: this.listData.originType
- })
- .then((res) => {
- if (res.code === 200) {
- this.tagList[0].num = res.data.allNum.toString()
- this.tagList[1].num = res.data.startNum.toString()
- this.tagList[2].num = res.data.endNum.toString()
- this.tagList[3].num = res.data.cancelNum.toString()
- }
- })
- },
- tyepToStr(type) {
- for (const item of this.types) {
- if (parseInt(item.id) === type) {
- return item.name;
- }
- }
- return '-'
- },
- // 璺宠浆璇︽儏
- jump(item) {
- uni.navigateTo({
- url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${item.id}`
- })
- },
- // 鑾峰彇澶撮儴缁勪欢楂樺害
- getHeight(height) {
- this.height = height
- },
- // 閲嶇疆
- reset() {
- this.listData.code = '';
- this.listData.page = 0;
- this.finished = false;
- this.lists = [];
- this.listData.planDateEnd = ''
- this.listData.planDateStart = ''
- this.listData.originType = ''
- this.types.forEach((item) => {
- item.isActive = false
- })
- this.getLists();
- this.getPageCount()
- },
- // 鏃ユ湡纭畾
- timeConfirm(val) {
- this.listData.planDateEnd = val.endDate
- this.listData.planDateStart = val.startDate
- this.timeShow = false
- },
- // 鍒囨崲宸ュ簭
- changeTags(i) {
- this.types[i].isActive = !this.types[i].isActive;
- listData.originType = this.types[i].id
- for (const index in this.types) {
- if (index != i) {
- const item = this.types[index]
- item.isActive = false
- }
- }
- },
- // 鎵撳紑鏃ユ湡鎻掍欢
- openDate() {
- this.timeShow = true
- },
- // 鎼滅储
- searchInput(val) {
- this.listData.code = val;
- this.listData.page = 0;
- this.finished = false;
- this.lists = [];
- this.getLists();
- this.getPageCount()
- },
- // 鐐瑰嚮鏍囩鎼滅储
- clickTag(ids) {
- this.listData.status = ids
- this.listData.page = 0;
- this.finished = false;
- this.lists = [];
- this.getLists()
- },
- // 鎼滅储寮规鎻愪氦
- submit() {
- this.listData.page = 0;
- this.finished = false;
- this.lists = [];
- this.getLists();
- this.getPageCount()
- },
- // 鑾峰彇璁″垝鍒楄〃鏁版嵁
- getLists() {
- if (!this.finished) {
- this.loading = true;
- this.listData.page = this.listData.page += 1;
- getBoundList({
- capacity: this.listData.capacity,
- model: {
- type: 0,
- codeOrHouse: this.listData.code,
- planDateEnd: this.listData.planDateEnd,
- planDateStart: this.listData.planDateStart,
- status: this.listData.status,
- billType: this.listData.originType
- },
- page: this.listData.page,
- sorts: [{
- direction: "ASC",
- property: "publishDate",
- }, ],
- }).then((res) => {
- this.loading = false;
- this.listData.total = res.data.total;
- if (res.code === 200) {
- if (this.listData.page === 1) {
- this.lists = res.data.records;
- } else {
- if (this.lists.length === res.data.total) {
- this.finished = true;
- return
- }
- this.lists.push(...res.data.records);
- }
- }
- }).finally(() => {
- this.loading = false;
- this.isLoading = false
- }).catch(err => {
- this.finished = true;
- this.loading = false;
- })
- } else {
- this.isLoading = false
- }
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .content {
- .content_search {
- width: 100%;
- padding: 30rpx;
- background: white;
- position: sticky;
- top: 0;
- z-index: 999;
- box-sizing: border-box;
-
- .Search_item {
- margin-bottom: 40rpx;
-
- .Search_item_label {
- font-size: 30rpx;
- font-weight: 500;
- color: #222222;
- }
-
- .Search_item_content {
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-top: 30rpx;
-
- .tag {
- display: flex;
- flex-wrap: wrap;
- align-items: center;
-
- .tag_active {
- background: $nav-color !important;
- color: #ffffff !important;
- }
-
- .tag_item {
- padding: 22rpx 26rpx;
- box-sizing: border-box;
- background: #F2F2F2;
- border-radius: 8rpx;
- font-size: 26rpx;
- font-weight: 400;
- color: #333333;
- display: flex;
- align-items: center;
- justify-content: center;
- margin-right: 22rpx;
- margin-bottom: 22rpx;
- }
- }
-
- text {
- font-size: 26rpx;
- font-weight: 400;
- color: #333333;
- margin: 0 30rpx;
- }
-
- .Search_item_content_a {
- padding: 20rpx 0;
- flex: 1;
- background: #F7F7F7;
- border-radius: 8rpx;
- border: 1rpx solid #EEEEEE;
- font-size: 26rpx;
- font-weight: 400;
- color: #B2B2B2;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- }
-
- .content_search_x {
- height: 24rpx;
- }
- }
-
- .content_list {
- width: 100%;
- display: flex;
- flex-direction: column;
-
- .content_list_item {
- width: 100%;
- box-sizing: border-box;
- padding: 30rpx;
- display: flex;
- flex-direction: column;
- border-bottom: 1rpx solid #ececec;
- background: white;
-
- .content_list_item_top {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- .content_list_item_top_left {
- display: flex;
- align-items: center;
-
- text {
- font-size: 32rpx;
- font-weight: 500;
- color: #333333;
- }
- }
-
- .content_list_item_top_right {
- font-size: 26rpx;
- font-weight: 400;
-
- .created {
- color: $nav-stateColor1 !important;
- }
-
- .warning {
- color: $nav-stateColor5 !important;
- }
-
- .green {
- color: $nav-stateColor6 !important;
- }
-
- .info {
- color: $nav-stateColor3 !important;
- }
- }
- }
-
- .content_list_item_content {
- padding: 24rpx 30rpx;
- background: #f7f7f7;
- border-radius: 16rpx;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- margin-top: 32rpx;
-
- .content_list_item_content_item {
- width: 100%;
- display: flex;
- margin-top: 24rpx;
-
- &:first-child {
- margin-top: 0;
- }
-
- // &:nth-child(1) {
- // margin-top: 0 !important;
- // }
- // &:nth-child(2) {
- // margin-top: 0 !important;
- // }
- .content_list_item_content_item_label {
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .content_list_item_content_item_nr {
- font-size: 24rpx;
- font-weight: 400;
- color: #222222;
- margin-right: 10rpx;
- }
- }
- }
- }
- }
-
- .content_total {
- width: 100%;
- height: 80rpx;
- padding: 24rpx 30rpx;
- background: #F7F7F7;
- font-size: 24rpx;
- font-weight: 400;
- box-sizing: border-box;
- color: #666666;
- position: sticky;
- z-index: 99;
- }
- }
-</style>
\ No newline at end of file
diff --git a/minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue b/minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue
deleted file mode 100644
index a266813..0000000
--- a/minipro_standard/pages_adjust/pages/reportingForWork/reportingForWork.vue
+++ /dev/null
@@ -1,1424 +0,0 @@
-<template>
- <view class="bg">
- <view class="bg_plan" @click="selectPlan">
- <view class="bg_plan_label" v-if="!from.processPlan">
- <text><text>*</text>宸ュ簭鐢熶骇璁″垝</text>
- </view>
- <view class="bg_plan_nr" v-else>
- <text>{{ from.processPlan.materialName }} | {{ from.processPlan.materialCode }} |
- {{ from.processPlan.produceName }}</text>
- <text>{{ from.processPlan.batch }}{{ from.processPlan.salesOrder ? ` / ${from.processPlan.salesOrder}` : '' }}</text>
- <text>璁″垝鏃堕棿锛歿{ from.processPlan.workPlanStartDate }} ~ {{ from.processPlan.workPlanEndDate }}</text>
- <text>璁″垝杩涘害锛歿{from.processPlan.num}}/{{from.processPlan.workorderDistributNum}}{{ from.processPlan.unitName }}</text>
- </view>
- <view class="bg_plan_label_val">
- <text v-if="!from.processPlan">璇烽�夋嫨</text>
- <image src="@/static/ic_ar@2x.png" alt="" />
- </view>
- </view>
- <!-- v-if="plansId" -->
- <template>
- <view class="bg_list">
- <view class="bg_list_item">
- <view class="bg_list_item_top">
- <view class="bg_list_item_top_left">
- <view class="bg_list_item_top_left_x"></view>
- <text>鐢熶骇淇℃伅</text>
- </view>
- </view>
- <view class="bg_list_item_h">
- <view class="bg_list_item_num" @click="openDev">
- <view class="bg_list_item_num_item">
- <text>鐢熶骇璁惧</text>
- <view class="bg_list_item_num_item_sr">
- <text
- :style="{color: from.deviceName ? '#333' : ''}">{{from.deviceName ? from.deviceName : '璇烽�夋嫨'}}</text>
- <image src="@/static/ic_ar@2x.png" alt="" />
- </view>
- </view>
- </view>
- <view class="bg_list_item_num" @click="userShow = true">
- <view class="bg_list_item_num_item">
- <text>鐢熶骇浜哄憳</text>
- <view class="bg_list_item_num_item_sr">
- <text
- :style="{color: from.userName ? '#333' : ''}">{{from.userName ? from.userName : '璇烽�夋嫨'}}</text>
- <image src="@/static/ic_ar@2x.png" alt="" />
- </view>
- </view>
- </view>
- </view>
- </view>
- <view class="bg_list_item">
- <view class="bg_list_item_top">
- <view class="bg_list_item_top_left">
- <view class="bg_list_item_top_left_x"></view>
- <text>鐢熶骇鎶曟枡</text>
- </view>
- <view class="bg_list_item_top_right" @click="openMaterial"
- v-if="(hasBom == 1 && bomType != 1) || hasBom == 0">
- <image src="@/static/gongdan_ic_shoudong@2x.png" alt="" />
- <text>鏂板鎶曟枡</text>
- </view>
- </view>
- <template v-if="wuList.length > 0 && !(hasBom == 1 && bomType == 1)">
- <van-swipe-cell v-for="(item, index) in wuList" :key="index">
- <view class="bg_list_item_h">
- <view class="bg_list_item_num">
- <view class="bg_list_item_num_item">
- <view class="bg_list_item_num_item_wl">
- <text>{{ item.materialName }}{{ item.procedureName ? ` | ${item.procedureName}` : '' }}</text>
- <view class="bg_list_item_num_item_wl_lx">
- <text class="green" v-if="item.qualityType == 0">鍚堟牸 / </text>
- <text class="yellow" v-if="item.qualityType == 1">涓嶈壇 / </text>
- <text class="red" v-if="item.qualityType == 2">鎶ュ簾 / </text>
- <text>{{ item.locationName || '-' }} / </text>
- <text>{{ item.batch || '-' }}</text>
- </view>
- </view>
- <view class="bg_list_item_num_item_sr">
- <u--input placeholder="璇疯緭鍏�" border="surround" type="number"
- :customStyle="{width: '100%'}" v-model="item.num"
- @input="inputwl(index)"></u--input>
- <!-- <input type="number" v-model="item.num" @input="inputwl(index)" /> -->
- <text>{{ item.unitName }}</text>
- </view>
- </view>
- </view>
- </view>
- <template #right>
- <van-button style="height: 100%;" @click="deleItem(index)" square text="鍒犻櫎"
- type="danger" />
- </template>
- </van-swipe-cell>
- </template>
- <template v-else-if="wuList.length == 0 && !(hasBom == 1 && bomType == 1)">
- <view class="kong">
- <text>鏆傛棤鏁版嵁</text>
- </view>
- </template>
- <view class="kong" v-if="hasBom == 1 && bomType == 1">
- <text>褰撳墠宸ュ簭鏃犻渶鎶曟枡</text>
- </view>
- </view>
- <view class="bg_list_item bottomval">
- <view class="bg_list_item_top">
- <view class="bg_list_item_top_left">
- <view class="bg_list_item_top_left_x"></view>
- <text>浜у嚭鏄庣粏</text>
- </view>
- </view>
- <view class="bg_list_item_h">
- <view class="bg_list_item_num">
- <view class="bg_list_item_num_item">
- <text><text>*</text>鑹搧鏁�</text>
- <view class="bg_list_item_num_item_sr">
- <!-- <u--input placeholder="璇疯緭鍏�" border="surround" type="number"
- :customStyle="{width: '180rpx'}" v-model="from.qualified" @input="changeNum(1)">
- </u--input> -->
- <input type="number" v-model="from.qualified" @input="changeNum(1)" placeholder="璇疯緭鍏�" />
- <text v-if="from.processPlan">{{from.processPlan.unitName}}</text>
- </view>
- </view>
- </view>
- <view class="bg_list_item_num">
- <view class="bg_list_item_num_item">
- <text>涓嶈壇鏁�</text>
- <view class="bg_list_item_num_item_sr">
- <!-- <u--input placeholder="璇疯緭鍏�" border="surround" type="number"
- :customStyle="{width: '180rpx'}" v-model="from.undesirable"
- @input="changeNum(2)"></u--input> -->
- <input type="number" v-model="from.undesirable" @input="$event => changeNum( 2)" placeholder="璇疯緭鍏�" />
- <text v-if="from.processPlan">{{from.processPlan.unitName}}</text>
- </view>
- </view>
- </view>
- <view class="bg_list_item_num" v-if="from.undesirable > 0">
- <view class="bg_list_item_num_item" @click="openBL">
- <!-- <text>*</text> -->
- <text>涓嶈壇椤�</text>
- <view class="bg_list_item_num_item_sr">
- <text class="wulll"
- :style="{color: from.defectiveName ? '#305ED5' : ''}">{{from.defectiveName ? from.defectiveName : '璁剧疆'}}</text>
- <image src="@/static/ic_ar@2x.png" alt="" />
- </view>
- </view>
- </view>
- </view>
- </view>
- <view class="bg_plan" @click="TimeShow = true">
- <view class="bg_plan_label">
- <text>鎶ュ伐鏃堕暱</text>
- </view>
- <view class="bg_plan_label_val">
- <text
- :style="{color: from.durationName ? '#333' : ''}">{{from.durationName ? from.durationName : '璇烽�夋嫨'}}</text>
- <image src="@/static/ic_ar@2x.png" alt="" />
- </view>
- </view>
- <view class="bg_list_item" v-if="arrType && arrType.length > 0 && from.duration > 0">
- <view class="bg_list_item_top">
- <view class="bg_list_item_top_left">
- <view class="bg_list_item_top_left_x"></view>
- <text>宸ヨ祫缁╂晥</text>
- </view>
- </view>
- <view class="bg_list_item_h">
- <view class="bg_list_item_num">
- <view class="bg_list_item_num_item">
- <text>璁′欢鏂瑰紡</text>
- <view class="bg_list_item_num_item_list">
- <view
- :class="item.active ? 'bg_list_item_num_item_list_item active' : 'bg_list_item_num_item_list_item'"
- v-for="(item, index) in arrType" :key="index"
- @click="clickPerformanceType(index)">{{ item.name }}</view>
- </view>
- </view>
- </view>
- <view class="bg_list_item_num">
- <view class="bg_list_item_num_item">
- <text>宸ヨ祫鍗曚环</text>
- <view class="bg_list_item_num_item_sr">
- <text
- class="color1">{{(arrType[from.index].salary / 10 / 10).toFixed(2)}}鍏�/{{arrType[from.index].type == 0 ? '浠�' : '鏃�'}}</text>
- </view>
- </view>
- </view>
- <view class="bg_list_item_num">
- <view class="bg_list_item_num_item">
- <text>棰勮宸ヨ祫</text>
- <view class="bg_list_item_num_item_sr">
- <text class="color1">{{expectedSalary}}鍏�</text>
- </view>
- </view>
- </view>
- <view class="bg_list_item_num">
- <view class="bg_list_item_num_item">
- <text>杈炬爣鐜�</text>
- <view class="bg_list_item_num_item_sr">
- <text class="color1">{{complianceRate}}%</text>
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- <!-- 鎶ュ伐鎸夐挳 -->
- <view class="bh_zw"></view>
- <view class="bg_footer">
- <view class="bg_footer_submit1" @click="continueSubmit">缁х画鎶ュ伐</view>
- <view class="bg_footer_submit" @click="submit">鎻愪氦</view>
- </view>
- </template>
-
- <!-- 鐢熶骇浜哄憳 -->
- <user :show="userShow" @close="userShow = false" @value="onConfirm1" />
- <!-- 鐢熶骇璁惧 -->
- <u-picker :show="deviceShow" :columns="deviceList" keyName="name" @confirm="onConfirm"
- @cancel="deviceShow = false"></u-picker>
- <!-- 鏃堕棿 -->
- <u-picker :show="TimeShow" :columns="columns" @confirm="onConfirm2" @cancel="TimeShow = false"></u-picker>
- <!-- 鐗╂枡 -->
- <MaterialSelect ref="MaterialSelect" :plansId="String(plansId)" :selected="ids" :deviceId="String(deviceId)"
- @value="getValue" />
- <!-- 涓嶈壇椤� -->
- <u-popup :show="show" @close="show = false" :round="8" closeable zIndex="20000">
- <view class="rp p40 contanir">
- <view class="c2 b tc">涓嶈壇椤�</view>
- <view class="content bl_list">
- <div class="bl_list_item" v-for="(item, i) in cateList" :key="i" @click="changeChecked(i)">
- <div class="bl_list_item_left">
- <u-checkbox-group @change="poorSelection(item.active, i)">
- <u-checkbox :checked="item.active" :label="item.name" :name="item.name"></u-checkbox>
- </u-checkbox-group>
- </div>
- <div class="bl_list_item_right">
- <input type="number" @click.stop v-model="item.num" placeholder="0" />
- </div>
- </div>
- </view>
- <view class="flex ap tc bottom-view">
- <view class="fx1 ml20 ptb20 sbtn_green" @click="onConfirm3">纭畾</view>
- </view>
- </view>
- </u-popup>
- </view>
-</template>
-
-<script>
- import user from '../../components/user.vue'
- import MaterialSelect from '../../components/MaterialSelect.vue'
- import {
- mapState
- } from 'vuex'
- import {
- getDeviceByCondition,
- getFindAll,
- queryOne,
- queryList,
- autoWorkReport,
- getIdPlansExt,
- categoryExtList
- } from '@/util/api/PlanningAPI'
- export default {
- components: {
- user,
- MaterialSelect
- },
- data() {
- return {
- from: {
- processPlan: null,
- deviceId: '',
- deviceName: '',
- // userId: userInfo.id,
- userId: '',
- // userName: userInfo.companyUser.name,
- userName: '',
- qualified: '', // 鑹搧鏁�
- undesirable: '', // 涓嶈壇鏁�
- duration: '',
- durationName: '0灏忔椂0鍒嗛挓',
- time: '',
- defective: [],
- defectiveName: '',
- type: '', // 缁╂晥绫诲瀷
- index: 0
- },
- columns: [],
- arrType: [],
- bomType: '',
- hasBom: '',
- deviceShow: false,
- userShow: false,
- wuList: [],
- deviceList: [],
- cateList: [{
- active: false,
- num: '',
- name: '鏈夌憰鐤�'
- }],
- total: 0, // 鍙姇鏁伴噺
- ids: '',
- plansId: '',
- deviceId: '',
- TimeShow: '',
- show1: '',
- show: false
- };
- },
- computed: {
- ...mapState(['userInfo']),
- // 棰勮宸ヨ祫
- expectedSalary() {
-
- if (this.arrType.length === 0) return 0;
- let {
- index,
- qualified,
- undesirable,
- duration
- } = this.from
- let temp = this.arrType[index]
- if (temp.type == 0) {
- if (!qualified) return 0
- if (temp.unqualified == 1) { // 鏄惁璁″叆涓嶈壇鍝�
- let total = Number(qualified) + Number(undesirable)
- return (total * (temp.salary / 10 / 10)).toFixed(2)
- } else {
- return (Number(qualified) * (temp.salary / 10 / 10)).toFixed(2)
- }
- } else {
- if (!duration) return 0;
- let h = (duration / 60 / 60).toFixed(2)
- return (Number(h) * (temp.salary / 10 / 10)).toFixed(2)
- }
- },
- // 杈炬爣鐜�
- complianceRate() {
- if (this.arrType.length === 0) return 0;
- let {
- index,
- qualified,
- undesirable,
- duration
- } = this.from
- let temp = this.arrType[index]
- if (!qualified && !undesirable) return 0;
- if (!duration) return 0;
- if (!temp.num) return 0;
- if (temp.unqualified == 1) { // 鏄惁璁″叆涓嶈壇鍝�
- let a = ((Number(qualified) + Number(undesirable)) / (duration / 3600)).toFixed(2)
- let b = (temp.num / (temp.times / 3600)).toFixed(2)
- return ((Number(a) / Number(b)) * 100).toFixed(2)
- } else {
- let a = (qualified / (duration / 3600)).toFixed(2)
- let b = (temp.num / (temp.times / 3600)).toFixed(2)
- return ((Number(a) / Number(b)) * 100).toFixed(2)
- }
- }
- },
- onReady() {
- let timer = setInterval(() => {
- if (this.userInfo) {
- this.from.userId = this.userInfo.id
- this.from.userName = this.userInfo.realname
- clearInterval(timer)
- }
- }, 500)
- },
- onLoad() {
- let arr = []
- for (let i = 0; i < 60; i++) {
- arr.push(i)
- }
- this.getData()
- this.columns = [arr, arr]
- // 鎺ユ敹璁″垝
- uni.$on('update', (data) => {
- this.from.processPlan = data.obj
- this.plansId = data.obj.id
- this.from.deviceId = ''
- this.from.deviceName = ''
- this.deviceId = ''
- this.total = data.obj.num - data.obj.workorderDistributNum
- this.wuList = []
- this.from.defective = []
- this.from.defectiveName = ''
- // this.from.userName = ''
- // this.from.userId = ''
- // 鑾峰彇璁惧
- getDeviceByCondition({
- procedureId: data.obj.procedureId
- })
- .then(res1 => {
- if (res1.code === 200) {
- if (res1.data && res1.data.length > 0) {
- this.deviceId = res1.data[0].id
- this.from.deviceId = res1.data[0].id
- this.from.deviceName = res1.data[0].name
- this.deviceList = [res1.data]
- }
- }
- })
- // 鑾峰彇绫诲瀷
- getIdPlansExt(data.obj.id)
- .then(res2 => {
- if (res2.code === 200) {
- this.bomType = res2.data.bomType
- this.hasBom = res2.data.hasBom
- }
- })
- // 鑾峰彇宸ヨ祫缁╂晥鏁版嵁
- queryList({
- deleted: 0,
- departId: data.obj.factoryId,
- materialId: data.obj.materialId,
- procedureId: data.obj.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
- console.log(this.arrType)
- } else {
- this.arrType = []
- }
- }
- })
- })
- },
- methods: {
- poorSelection(val, i) {
- this.cateList.forEach((item, index) => {
- if (i === index) {
- item.active = !item.active
- }
- })
- },
- // 鍒囨崲缁╂晥绫诲瀷
- clickPerformanceType(i) {
- this.from.index = i
- this.arrType.forEach((item, index) => {
- if (i === index) {
- this.from.type = item.id
- }
- item.active = index === i
- })
- },
- // 閫夋嫨鐗╂枡
- getValue(val) {
- let obj = JSON.parse(JSON.stringify(val))
- obj.total = val.num
- this.wuList.unshift(obj)
- let arr = this.wuList.map(item => item.id)
- this.ids = arr
- },
- // 鑾峰彇涓嶈壇椤圭洰
- getData() {
- categoryExtList({
- cateType: "3"
- }).then(res => {
- if (res.code === 200) {
- res.data.forEach(item => {
- item.active = false
- item.num = ''
- })
- this.cateList = res.data
- }
- })
- },
- // 閫夋嫨璁惧
- onConfirm(e) {
- this.from.deviceId = e.value[0].id
- this.from.deviceName = e.value[0].name
- this.deviceId = e.value[0].id
- this.from.userId = ''
- this.from.userName = ''
- // getFindAll({
- // deviceId: e.id,
- // planId: from.processPlan.id
- // }).then(res => {
- // if (res.code === 200) {
- // res.data.forEach((item: any) => {
- // item.name = item.umodel.name + '-' + item.tmodel.name
- // })
- // userList.value = res.data
- // }
- // })
- this.deviceShow = false
- },
- // 閫夋嫨涓嶈壇椤�
- onConfirm3() {
- let isOpen = false
- this.cateList.forEach((item, index) => {
- if (item.active) {
- isOpen = true
- }
- })
- if (!isOpen) return uni.showToast({
- title: '璇烽�夋嫨涓嶈壇椤�',
- icon: 'none',
- duration: 2000
- });
- let arr = []
- let total = 0
- let name = ''
- for (let i = 0; i < this.cateList.length; i++) {
- if (this.cateList[i].active) {
- if (Number(this.cateList[i].num) <= 0) {
- return uni.showToast({
- title: '涓嶈壇鏁伴噺蹇呴』澶т簬0',
- icon: 'none',
- duration: 2000
- });
- }
- total = total += Number(this.cateList[i].num)
- arr.push(this.cateList[i])
- name += this.cateList[i].name + this.cateList[i].num + '锛�'
- }
- }
- if (total !== Number(this.from.undesirable)) return uni.showToast({
- title: '涓嶈壇鏁板繀椤荤瓑浜庝骇鍑轰笉鑹暟',
- icon: 'none',
- duration: 2000
- });
- this.from.defective = arr
- this.from.defectiveName = name
- this.show = false
- },
- changeChecked(i) {
- this.cateList[i].active = !this.cateList[i].active
- },
- onConfirm2(e) {
- let h = e.value[0]
- let m = e.value[1]
- let s = 0
- if (h > 0) {
- s += h * 60 * 60
- }
- if (m > 0) {
- s += m * 60
- }
- this.from.duration = s
- this.from.durationName = `${h}灏忔椂${m}鍒嗛挓`
- this.TimeShow = false
- },
- onConfirm1(e) {
- this.from.userId = e.userId
- this.from.userName = e.name
- this.userShow = false
- },
- selectPlan() {
- uni.navigateTo({
- url: '/pages_adjust/pages/processPlan/processPlan'
- });
- },
- openDev() {
- if (!this.from.processPlan) return uni.showToast({
- title: '璇峰厛閫夋嫨宸ュ簭鐢熶骇璁″垝',
- icon: 'none',
- duration: 2000
- });
- this.deviceShow = true
- },
- openMaterial() {
- if (!this.plansId) return uni.showToast({
- title: '璇峰厛閫夋嫨宸ュ簭鐢熶骇璁″垝',
- icon: 'none',
- duration: 2000
- });
- if (!this.deviceId) return uni.showToast({
- title: '璇峰厛閫夋嫨鐢熶骇璁惧',
- icon: 'none',
- duration: 2000
- });
- this.$refs.MaterialSelect.open()
- },
- inputwl(i) {
- if (this.wuList[i].num > this.wuList[i].total) {
- this.wuList[i].num = ''
- uni.showToast({
- title: '鎶曟枡鏁伴噺涓嶈兘澶т簬搴撳瓨鏁伴噺',
- icon: 'none',
- duration: 2000
- });
- }
- },
- deleItem(index) {
- if (this.wuList.length === 1) return uni.showToast({
- title: '鑷冲皯淇濈暀涓�椤瑰唴瀹�',
- icon: 'none',
- duration: 2000
- });
- this.wuList.splice(index, 1)
- },
- // 浜у嚭鏁伴噺楠岃瘉
- changeNum(type) {
- if (type == 2) {
- this.from.defective = []
- this.from.defectiveName = ''
- } else {
- this.from.qualified = event
- }
- let num = this.total - (Number(this.from.qualified) + Number(this.from.undesirable))
- if (num < 0) {
- uni.$u.toast('浜у嚭鏁伴噺涓嶈兘澶т簬鍙骇鍑烘暟閲忥紒')
- }
- },
- openBL() {
- this.cateList.forEach(item => {
- if (!item.active) {
- item.num = ''
- }
- if (item.active && item.num <= 0) {
- item.active = false
- }
- })
- this.show = true
- },
- // 缁х画鎶ュ伐
- continueSubmit() {
- if (!this.from.processPlan) return uni.showToast({
- title: '璁″垝涓嶈兘涓虹┖',
- icon: 'none',
- duration: 2000
- });
- if (!this.from.deviceId) return uni.showToast({
- title: '璁惧涓嶈兘涓虹┖',
- icon: 'none',
- duration: 2000
- });
- if (!this.from.userId) return uni.showToast({
- title: '鐢熶骇浜哄憳涓嶈兘涓虹┖',
- icon: 'none',
- duration: 2000
- });
- if (this.hasBom == 1 && this.bomType == 1) {
- console.log('涓嶉渶瑕佹姇鏂�')
- } else {
- if (!this.wuList.length === 0) return uni.showToast({
- title: '鎶曟枡涓嶈兘涓虹┖',
- icon: 'none',
- duration: 2000
- });
- }
- if (!this.from.qualified && !this.from.undesirable) {
- return uni.showToast({
- title: '鑹搧鏁颁笌涓嶈壇鏁颁笉鑳藉悓鏃朵负绌�',
- icon: 'none',
- duration: 2000
- });
- }
- if (this.from.qualified && this.from.qualified <= 0) {
- return uni.showToast({
- title: '鑹搧鏁板繀椤诲ぇ浜�0',
- icon: 'none',
- duration: 2000
- });
- }
- if (this.from.undesirable && this.from.undesirable <= 0) {
- return uni.showToast({
- title: '涓嶈壇鍝佹暟蹇呴』澶т簬0',
- icon: 'none',
- duration: 2000
- });
- }
- // 鏈変笉鑹暟
- if (this.from.undesirable > 0) {
- if (this.from.defective.length === 0) return uni.showToast({
- title: '涓嶈壇椤逛笉鑳戒负绌�',
- icon: 'none',
- duration: 2000
- });
- }
- let type = ''
- this.arrType.forEach(item => {
- if (item.active) {
- type = item.id
- }
- })
- autoWorkReport({
- createWorkorderRecordDTO: {
- type,
- duration: this.from.duration,
- qualifiedNum: this.from.qualified ? this.from.qualified : 0,
- unQualifiedNum: this.from.undesirable ? this.from.undesirable : 0
- },
- plansId: this.from.processPlan.id,
- proGroupId: this.deviceId,
- proUserList: [this.from.userId],
- recordList: this.wuList.map(item => {
- return {
- wstockId: item.id,
- num: item.num
- }
- }),
- createUnqualifiedDTOList: this.from.defective.map(item => {
- return {
- categoryId: item.id,
- unQualifiedNum: item.num
- }
- })
- }).then(res => {
- if (res.code === 200) {
- uni.showToast({
- title: '鎶ュ伐鎴愬姛锛�',
- icon: 'success',
- duration: 2000
- });
- this.arrType = []
- this.from.processPlan = null
- this.from.deviceId = ''
- this.from.deviceName = ''
- this.from.userId = ''
- this.from.userName = ''
- this.from.qualified = ''
- this.from.undesirable = ''
- this.from.duration = ''
- this.from.durationName = '0灏忔椂0鍒嗛挓'
- this.from.time = ''
- this.from.defective = []
- this.from.defectiveName = ''
- this.wuList = []
- this.deviceId = ''
- this.plansId = ''
- this.ids = ''
- this.total = 0
- }
- })
- },
- // 鎶ュ伐
- submit() {
- if (!this.from.processPlan) return uni.showToast({
- title: '璁″垝涓嶈兘涓虹┖',
- icon: 'none',
- duration: 2000
- });
- if (!this.from.deviceId) return uni.showToast({
- title: '璁惧涓嶈兘涓虹┖',
- icon: 'none',
- duration: 2000
- });
- if (!this.from.userId) return uni.showToast({
- title: '鐢熶骇浜哄憳涓嶈兘涓虹┖',
- icon: 'none',
- duration: 2000
- });
- if (this.hasBom == 1 && this.bomType == 1) {
- console.log('涓嶉渶瑕佹姇鏂�')
- } else {
- if (!this.wuList.length === 0) return uni.showToast({
- title: '鎶曟枡涓嶈兘涓虹┖',
- icon: 'none',
- duration: 2000
- });
- }
- if (!this.from.qualified && !this.from.undesirable) {
- return uni.showToast({
- title: '鑹搧鏁颁笌涓嶈壇鏁颁笉鑳藉悓鏃朵负绌�',
- icon: 'none',
- duration: 2000
- });
- }
- // 鏈変笉鑹暟
- if (this.from.undesirable > 0) {
- if (this.from.defective.length === 0) return uni.showToast({
- title: '涓嶈壇椤逛笉鑳戒负绌�',
- icon: 'none',
- duration: 2000
- });
- }
- let type = ''
- this.arrType.forEach(item => {
- if (item.active) {
- type = item.id
- }
- })
- autoWorkReport({
- createWorkorderRecordDTO: {
- type,
- duration: this.from.duration,
- qualifiedNum: this.from.qualified ? this.from.qualified : 0,
- unQualifiedNum: this.from.undesirable ? this.from.undesirable : 0
- },
- plansId: this.from.processPlan.id,
- proGroupId: this.deviceId,
- proUserList: [this.from.userId],
- recordList: this.wuList.map(item => {
- return {
- wstockId: item.id,
- num: item.num
- }
- }),
- createUnqualifiedDTOList: this.from.defective.map(item => {
- return {
- categoryId: item.id,
- unQualifiedNum: item.num
- }
- })
- }).then(res => {
- if (res.code === 200) {
- uni.showToast({
- title: '鎶ュ伐鎴愬姛锛�',
- icon: 'success',
- duration: 2000
- });
- setTimeout(() => {
- uni.navigateBack({
- delta: 1
- });
- }, 2000);
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .bg {
- width: 100%;
- position: absolute;
- background: #F7F7F7;
-
- .contanir {
- height: calc(env(safe-area-inset-bottom) + 720rpx);
-
- .content {
- margin-top: 20rpx;
-
- .type-style {
- width: 325rpx;
- margin-bottom: 20rpx;
- }
- }
- }
-
- .bg_plan {
- width: 100%;
- // height: 98rpx;
- padding: 30rpx;
- box-sizing: border-box;
- background: #FFFFFF;
- margin-bottom: 40rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- text {
- font-size: 30rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #222222;
-
- text {
- color: red;
- }
- }
-
- .bg_plan_nr {
- display: flex;
- flex-direction: column;
-
- text {
- font-size: 24rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #666666;
- margin-top: 20rpx;
-
- &:first-child {
- font-size: 32rpx;
- font-family: PingFangSC-Medium, PingFang SC;
- font-weight: 500;
- color: #333333;
- margin-top: 0 !important;
- }
- }
- }
-
- .bg_plan_label_val {
- display: flex;
- align-items: center;
-
- text {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- }
-
- image {
- width: 12rpx;
- height: 24rpx;
- margin-left: 20rpx;
- }
- }
- }
-
- .bg_list {
- width: 100%;
- display: flex;
- flex-direction: column;
-
- .bottomval {
- margin-bottom: 20rpx !important;
- }
-
- .bg_list_item {
- display: flex;
- flex-direction: column;
- margin-bottom: 40rpx;
-
- .kong {
- text-align: center;
- padding: 30rpx 0;
- background: #ffffff;
- font-size: 25rpx;
-
- text {
- color: #474747;
- }
- }
-
- .bg_list_item_top {
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding-left: 30rpx;
- padding-right: 30rpx;
- margin-bottom: 30rpx;
-
- .bg_list_item_top_left {
- display: flex;
- align-items: center;
-
- .left {
- margin-left: 12rpx;
- font-size: 28rpx;
- }
-
- .warning {
- width: 8rpx;
- height: 30rpx;
- border-radius: 2rpx;
- margin-right: 12rpx;
- background: $nav-stateColor5 !important;
- }
-
- .error {
- width: 8rpx;
- height: 30rpx;
- border-radius: 2rpx;
- margin-right: 12rpx;
- background: $nav-stateColor4 !important;
- }
-
- .bg_list_item_top_left_x {
- width: 8rpx;
- height: 30rpx;
- background: $nav-color;
- border-radius: 2rpx;
- margin-right: 12rpx;
- }
-
- text {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
- display: flex;
- align-items: center;
- }
- }
-
- .bg_list_item_top_right {
- display: flex;
- align-items: center;
-
- image {
- width: 28rpx;
- height: 28rpx;
- margin-right: 12rpx;
- }
-
- text {
- font-size: 28rpx;
- font-weight: 400;
- color: $nav-color;
- }
- }
- }
-
- .top {
- margin-top: 20rpx !important;
- }
-
- .bg_list_item_h {
- width: 100%;
- padding: 0 30rpx;
- box-sizing: border-box;
- background: white;
-
- .bg_list_item_num {
- width: 100%;
- min-height: 98rpx;
- background: white;
- display: flex;
- justify-content: center;
- align-items: center;
- border-bottom: 1rpx solid #E5E5E5;
-
- &:last-child {
- border: none !important;
- }
-
- .kong {
- text-align: center;
- font-size: 25rpx;
- padding: 30rpx 0;
- background: #ffffff;
- }
-
- .bg_list_item_num_item {
- width: 100%;
- height: 100%;
- display: flex;
- align-items: center;
- // height: 118rpx;
- padding: 15rpx 0;
- box-sizing: border-box;
- justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
-
- &:last-child {
- border: none;
- }
-
- .bg_list_item_num_item_list {
- display: flex;
- align-items: center;
-
- .active {
- background: #305ED5 !important;
- color: #FFFFFF !important;
- }
-
- .bg_list_item_num_item_list_item {
- width: 116rpx;
- height: 62rpx;
- line-height: 62rpx;
- text-align: center;
- background: #F2F2F2;
- border-radius: 8rpx;
- font-size: 26rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #333333;
- margin-right: 20rpx;
-
- &:last-child {
- margin: 0 !important;
- }
- }
- }
-
- .bg_list_item_num_item_wl {
- flex: 1;
- display: flex;
- flex-direction: column;
-
- text {
- font-size: 34rpx;
- color: #222222;
- }
-
- .bg_list_item_num_item_wl_lx {
- margin-top: 10rpx;
-
- text {
- color: #222222;
- font-size: 28rpx;
- }
- }
- }
-
- .warning {
- color: $nav-stateColor5 !important;
- }
-
- .err {
- color: $nav-stateColor4 !important;
- }
-
- image {
- width: 12rpx;
- height: 24rpx;
- margin-left: 20rpx;
- }
-
- text {
- flex-shrink: 0;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-
- text {
- font-size: 30rpx;
- color: red !important;
- margin-right: 5rpx;
- }
-
- .warning {
- color: $nav-stateColor5 !important;
- margin-right: 5rpx;
- }
-
- .err {
- color: $nav-stateColor4 !important;
- margin-right: 5rpx;
- }
-
- &:nth-child(1) {
- font-size: 30rpx;
- font-weight: 400;
- color: #222222;
- }
-
- &:nth-child(2) {
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
- flex-shrink: 0;
- }
- }
-
- .bg_list_item_num_item_sr {
- // flex: 1;
- flex-shrink: 0;
- width: 230rpx;
- display: flex;
- align-items: center;
- justify-content: flex-end;
-
- .color1 {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #333333;
- }
-
- input::-webkit-input-placeholder {
- font-size: 28rpx;
- }
-
- input {
- text-align: right;
- width: 180rpx;
- height: 60rpx;
- border-radius: 8rpx;
- border: 1rpx solid #E5E5E5;
- margin-right: 20rpx;
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
- padding: 0 30rpx;
- margin-right: 20rpx;
- }
-
- .wulll {
- width: 400rpx;
- text-align: right;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- }
-
- text {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- }
- }
- }
- }
- }
- }
- }
-
- .bh_zw {
- height: 160rpx;
- }
-
- .bg_footer {
- position: fixed;
- bottom: 0;
- left: 0;
- width: 100%;
- z-index: 9;
- padding: 0 30rpx 60rpx 30rpx;
- box-sizing: border-box;
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- .bg_footer_submit1 {
- width: 334rpx;
- height: 88rpx;
- line-height: 88rpx;
- text-align: center;
- background: #FFFFFF;
- box-shadow: 0rpx 0rpx 12rpx 0rpx rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- font-size: 30rpx;
- font-family: PingFangSC-Medium, PingFang SC;
- font-weight: 500;
- color: #305ED5;
- }
-
- .bg_footer_submit {
- width: 334rpx;
- height: 88rpx;
- background: $nav-color;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- font-size: 30rpx;
- font-weight: 500;
- color: #FFFFFF;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
-
- .bl {
- width: 100%;
- height: 800rpx;
- padding: 30rpx;
- box-sizing: border-box;
- display: flex;
- flex-direction: column;
-
- .bl_head {
- width: 100%;
- height: 50rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- text {
- font-size: 28rpx;
- color: #222222;
-
- &:nth-child(2) {
- font-size: 32rpx !important;
- }
- }
-
- image {
- width: 28rpx;
- height: 28rpx;
- }
- }
-
- .bl_footer {
- width: 100%;
- height: 88rpx;
- line-height: 88rpx;
- text-align: center;
- background: #305ED5;
- border-radius: 8rpx;
- font-size: 32rpx;
- font-family: PingFangSC-Medium, PingFang SC;
- font-weight: 500;
- color: #FFFFFF;
- margin-top: 30rpx;
- }
-
- .bl_list {
- width: 100%;
- height: calc(100% - 168rpx);
- overflow-y: scroll;
- margin-top: 30rpx;
-
- .bl_list_item {
- width: 100%;
- height: 96rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
-
- &:last-child {
- border: none !important;
- }
-
- .bl_list_item_left {
- flex: 1;
- display: flex;
- align-items: center;
-
- input {
- width: 30rpx;
- height: 30rpx;
- border: 1rpx solid #CCCCCC;
- margin: 0 !important;
- }
-
- text {
- font-size: 30rpx;
- color: #222222;
- margin-left: 10rpx;
- }
- }
-
- .bl_list_item_right {
- width: 200rpx;
- flex-shrink: 0;
- height: 50rpx;
- text-align: right;
-
- input {
- padding-left: 5rpx;
- width: 160rpx;
- height: 100%;
- padding: 0 30rpx;
- box-sizing: border-box;
- text-align: right;
- font-size: 28rpx;
- color: #333333;
- border-radius: 10rpx;
- border: 1rpx solid #CCCCCC;
-
- &::-webkit-input-placeholder {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- }
- }
- }
- }
- }
- }
-
- .bl_list {
- width: 100%;
- height: calc(100% - 168rpx);
- overflow-y: scroll;
- margin-top: 30rpx;
-
- .bl_list_item {
- width: 100%;
- height: 96rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rPX solid #E5E5E5;
-
- &:last-child {
- border: none !important;
- }
-
- .bl_list_item_left {
- flex: 1;
- display: flex;
- align-items: center;
-
- input {
- width: 30rpx;
- height: 30rpx;
- border: 1rpX solid #CCCCCC;
- margin: 0 !important;
- }
-
- span {
- font-size: 30rpx;
- color: #222222;
- margin-left: 10rpx;
- }
- }
-
- .bl_list_item_right {
- width: 200rpx;
- flex-shrink: 0;
- height: 50rpx;
- text-align: right;
-
- input {
- padding-left: 5rpx;
- width: 180rpx;
- height: 60rpx;
- border-radius: 8rpx;
- border: 1rpx solid #CCCCCC;
- padding: 0 30rpx;
- box-sizing: border-box;
- text-align: right;
- font-size: 28rpx;
- color: #333333;
- border-radius: 10rpx;
- border: 1rPX solid #CCCCCC;
-
- &::-webkit-input-placeholder {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- }
- }
- }
- }
- }
-
- .bottom-view {
- left: 40rpx;
- right: 40rpx;
- bottom: 20rpx
- }
- }
-</style>
diff --git a/minipro_standard/pages_adjust/pages/spotCheck/spotCheck.vue b/minipro_standard/pages_adjust/pages/spotCheck/spotCheck.vue
deleted file mode 100644
index 45e5fdb..0000000
--- a/minipro_standard/pages_adjust/pages/spotCheck/spotCheck.vue
+++ /dev/null
@@ -1,431 +0,0 @@
-<template>
- <view class="tl">
- <V-WorkOrderInfo :orederMessage="info"></V-WorkOrderInfo>
- <div class="tl_title">
- <div class="tl_title_left">
- <div class="tl_title_left_x"></div>
- <span>鐢熶骇鐐规</span>
- </div>
- <div class="tl_title_right" @click="add">
- <image src="../../static/gongdan_ic_shoudong@2x.png" class="img24" mode=""></image>
- <!-- <img src="@/assets/icon/gongdan_ic_shoudong@2x.png" alt="" /> -->
- <span>澧炲姞灞炴��</span>
- </div>
- </div>
- <u-swipe-action>
- <u-swipe-action-item v-for="(item, index) in formList" :key="index" :options="options1"
- @click="dele(index)">
- <div class="tl_list">
- <div class="tl_list_item" @click="open(index)">
- <div class="tl_list_item_label">鐢熶骇灞炴��</div>
- <div class="tl_list_item_go">
- <span
- :style="item.attributeName ? 'color: #000;' : ''">{{ item.attributeName ? item.attributeName : '璇烽�夋嫨'}}</span>
- <u-icon name="arrow-right" color="#999999" size="20"></u-icon>
- </div>
- </div>
- <div class="tl_list_item" v-if="item.type === ''">
- <div class="tl_list_item_label">灞炴�у��1</div>
- <div class="tl_list_item_go">
- <input type="text" v-model="item.num" placeholder="璇疯緭鍏�" />
- </div>
- </div>
- <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" @change="radioSelect">
- <u-radio v-for="(item1, i) in item.data" :key="i" activeColor="#4275FC" :name="item1"
- :label="item1">
- </u-radio>
- </u-radio-group>
- </div>
- </div>
- <div class="tl_list_item" v-else-if="item.type === 1">
- <div class="tl_list_item_label">灞炴�у��</div>
- <div class="tl_list_item_go">
- <u-checkbox-group v-model="item.num" placement="row">
- <u-checkbox v-for="(item1, i) in item.data" :key="i" :label="item1" :name="item1">
- </u-checkbox>
- </u-checkbox-group>
- </div>
- </div>
- <div class="tl_list_item" v-else-if="item.type === 2">
- <div class="tl_list_item_label">灞炴�у��</div>
- <div class="tl_list_item_go">
- <input type="text" v-model="item.num" :placeholder="item.tips" />
- </div>
- </div>
- <div class="tl_list_item" v-else-if="item.type === 3">
- <div class="tl_list_item_label">灞炴�у��</div>
- <div class="tl_list_item_go">
- <input v-model="item.num" type="digit" :placeholder="item.tips" />
- <!-- <u--input v-model="item.num" :placeholder="item.tips" type="digit"
- border="surround"></u--input> -->
- </div>
- </div>
- <div class="tl_list_item" @click="openTimer(index)" v-else-if="item.type === 4">
- <div class="tl_list_item_label">灞炴�у��</div>
- <div class="tl_list_item_go">
- <span :style="item.num ? 'color: #000;' : ''">{{item.num ? item.num : item.tips}}</span>
- <u-icon name="arrow-right" color="#999999" size="20"></u-icon>
- </div>
- </div>
- </div>
- </u-swipe-action-item>
- </u-swipe-action>
-
- <div class="tl_zw"></div>
- <div class="tl_footer">
- <button class="tl_footer_submit" v-preventReClick @click="submit">鎻愪氦</button>
- </div>
- <u-picker :show="show" :columns="[gzqjData]" title="閫夋嫨鐢熶骇灞炴��" @confirm="gzqjConfirm" @cancel="show=false">
- </u-picker>
- <u-datetime-picker :show="timer" v-model="value1" @cancel="timer=false" @confirm="onConfirm" mode="datetime">
- </u-datetime-picker>
- </view>
-</template>
-
-<script>
- import VWorkOrderInfo from '@/components/workOrderInfo.vue'
- import {
- setTimeO
- } from '@/util/utils.js'
- import {
- queryById,
- getJdList,
- createDJ
- } from '@/util/api/WorkOrderAPI'
- export default {
- components: {
- VWorkOrderInfo
- },
- data() {
- return {
- options1: [{
- text: '鍒犻櫎',
- style: {
- backgroundColor: '#f00',
- }
- }],
- value1: Number(new Date()),
- show: false,
- timer: false,
- index: '',
- workOrderId: '',
- info: {},
- gzqjData: [],
- formList: [{
- id: Date.now(),
- attribute: '', // 灞炴�у��
- attributeName: '', // 灞炴�у�煎悕绉�
- data: '', // 鏁版嵁
- type: '', // 绫诲瀷
- tips: '', // 鎻愮ず瀛�
- num: '' // 鏁伴噺
- }]
- }
- },
- onLoad(obj) {
- this.workOrderId = obj.id
- this.queryByIds()
- this.getJdLists()
- },
- methods: {
- queryByIds() {
- queryById(this.workOrderId)
- .then(res => {
- console.log(res);
- this.info = res.data
- })
- },
- getJdLists() {
- getJdList({
- workOrderID: this.workOrderId
- })
- .then(res => {
- if (res.code === 200 && res.data && res.data.length !== 0) {
- res.data.forEach(item => {
- this.gzqjData.push({
- text: item.name,
- id: item.id,
- type: item.type,
- data: item.remark ? item.remark.split(' ') : '',
- tips: item.tips
- })
- })
- }
- })
- },
- add() {
- this.formList.push({
- id: Date.now(),
- attribute: '',
- attributeName: '',
- num: '',
- type: '',
- data: '',
- tips: ''
- })
- },
- open(index) {
- this.index = index
- this.show = true
- },
- // 鎵撳紑鏃ユ湡鎻掍欢
- openTimer(index) {
- this.index = index
- this.timer = true
- },
- gzqjConfirm({
- value
- }) {
- console.log(value);
- let temp = value[0]
- this.formList[this.index] = {
- attribute: temp.id,
- attributeName: temp.text,
- type: temp.type,
- data: temp.data,
- tips: temp.tips,
- num: '',
- }
- if (temp.type === 1) {
- this.formList[this.index].num = []
- } else if (temp.type === 0) {
- this.formList[this.index].num = temp.data[0]
- } else if (temp.type === 4) {
- this.formList[this.index].num = setTimeO(new Date(), '-')
- }
- // this.formList.forEach((item, index) => {
- // if (this.index === index) {
- // item.attribute = value.id
- // item.attributeName = value.text
- // item.type = value.type
- // item.data = value.data
- // item.tips = value.tips
- // console.log(value)
- // item.num = ''
- // if (item.type === 1) {
- // item.num = []
- // } else if (item.type === 0) {
- // item.num = item.data[0]
- // }
- // if (value.type === 4) {
- // formList.value[indexs.value].num = setTimeO(new Date(), '-')
- // }
- // }
- // })
- this.show = false
- },
- dele(index) {
- if (this.formList.length === 1) {
- uni.$u.toast('鑷冲皯淇濈暀涓�鏉＄偣妫�淇℃伅')
- return
- }
- this.formList.splice(index, 1)
- },
- onConfirm(value) {
- console.log(value);
- this.formList.forEach((item, index) => {
- if (this.index === index) {
- item.num = setTimeO(new Date(value.value), '-')
- }
- })
- this.timer = false;
- },
- radioSelect(v) {
- console.log(v);
- },
- submit() {
- let isOpen = true
- let attrList = []
-
- this.formList.forEach(item => {
- console.log('-------', item);
- if (item.type === 1) {
- if (item.attribute === '' || item.num.length === 0) {
- isOpen = false
- return
- } else {
- attrList.push({
- val: item.num.join(' '),
- attrId: item.attribute
- })
- }
- } else {
- if (item.attribute === '' || item.num === '') {
- isOpen = false
- return
- } else {
- attrList.push({
- val: item.num,
- attrId: item.attribute
- })
- }
- }
- })
- if (!isOpen) {
- uni.$u.toast('璇峰皢淇℃伅濉啓瀹屾暣')
- return
- }
-
- createDJ({
- attrList: attrList,
- id: this.workOrderId
- }).then(res => {
- if (res.code === 200) {
- uni.$emit('spotAdd')
- uni.$u.toast('鍒涘缓鎴愬姛')
- setTimeout(() => {
- uni.navigateBack()
- }, 1000)
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .tl {
- width: 100%;
- height: 100%;
- position: absolute;
- background: #F7F7F7;
-
- .tl_title {
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding: 30rpx;
-
- .tl_title_left {
- display: flex;
- align-items: center;
-
- .tl_title_left_x {
- width: 8rpx;
- height: 30rpx;
- background: $nav-color;
- border-radius: 2rpx;
- margin-right: 12rpx;
- }
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
- }
- }
-
- .tl_title_right {
- display: flex;
- align-items: center;
-
- img {
- width: 28rpx;
- height: 28rpx;
- margin-right: 12rpx;
- }
-
- span {
- font-size: 28rpx;
- font-weight: 400;
- color: $nav-color;
- }
- }
- }
-
- .tl_list {
- display: flex;
- flex-direction: column;
- background: white;
- padding: 0 30rpx;
- // margin-bottom: 20rpx;
-
- .tl_list_item {
- min-height: 98rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
-
- &:last-child {
- border: none;
- }
-
- .tl_list_item_label {
- font-size: 30rpx;
- font-weight: 400;
- flex-shrink: 1;
- color: #222222;
- }
-
- .tl_list_item_go {
- display: flex;
- align-items: center;
- flex: 1;
- justify-content: flex-end;
-
- input {
- text-align: right;
- width: 450rpx;
- height: 60rpx;
- border-radius: 8rpx;
- border: 1rpx solid #E5E5E5;
- padding: 0 30rpx;
- box-sizing: border-box;
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
- }
-
- span {
- font-size: 28rpx;
- font-weight: 400;
- color: #999999;
- margin-right: 10rpx;
- }
- }
- }
- }
-
- .tl_zw {
- height: 160rpx;
- }
-
- .tl_footer {
- width: 100%;
- position: fixed;
- bottom: 0;
- left: 0;
- padding: 0 30rpx 68rpx 30rpx;
- box-sizing: border-box;
-
- .tl_footer_submit {
- width: 690rpx;
- height: 88rpx;
- border: none;
- background: #4275FC;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- font-size: 30rpx;
- font-weight: 500;
- color: #FFFFFF;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- }
-
- /deep/ .u-checkbox-group {
- flex-wrap: wrap;
- max-width: 100%;
- }
-
- /deep/ .u-radio-group {
- flex-wrap: wrap;
- max-width: 100%;
- }
-</style>
diff --git a/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue b/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
deleted file mode 100644
index 06f7ac9..0000000
--- a/minipro_standard/pages_adjust/pages/warehousingDetails/warehousingDetails.vue
+++ /dev/null
@@ -1,480 +0,0 @@
-<template>
- <view class="content2">
- <view class="order-message">
- <view class="content_list_item_top">
- <view class="content_list_item_top_left">
- <!-- <text>杞簱鍗曞彿锛�</text>-->
- <text>{{ data.code }}</text>
- </view>
- <view class="content_list_item_top_right">
- <text class="created" v-if="data.status === 0">寰呭嚭搴�</text>
- <text class="warning" v-else-if="data.status === 1">宸插嚭搴�</text>
- <text class="green" v-else-if="data.status == 2">宸插叆搴�</text>
- <text class="info" v-else-if="data.status === 3">宸插彇娑�</text>
- </view>
- </view>
- <!-- item涓婚淇℃伅閮ㄥ垎 -->
- <view class="content_list_item_content">
- <view style="margin-top: 0 " class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鍗曟嵁绫诲瀷锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ tyepToStr(data.type) }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">杞嚭缁勭粐锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ data.outDepartName }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">杞叆缁勭粐锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ data.inDepartName }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">杞嚭浠撳簱锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ data.outWarehouseName }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">杞嚭浠撶鍛橈細</view>
- <view class="content_list_item_content_item_nr">
- {{ data.outUserName }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">杞叆浠撳簱锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ data.inWarehouseName }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">杞叆浠撶鍛橈細</view>
- <view class="content_list_item_content_item_nr">
- {{ data.inUserName }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">璁″垝杞嚭鏃ユ湡锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ data.outPlandate }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">璁″垝杞叆鏃ユ湡锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ data.inPlandate }}
- </view>
- </view>
- </view>
- <!-- 杞簱鐗╂枡 -->
- <view class="material-title">
- <view class="title">
- <text class="title-prefix"></text>
- <text>杞簱鐗╂枡</text>
- </view>
- </view>
- <view class="material-content">
- <view class="item-style" v-for="(item, index) in data.wtransferDetailList" :key="index">
- <view class="item-title-style">
- <text style="font-weight: 500;">{{ item.materialName + ' | ' + item.materialCode}}</text>
- </view>
- <view class="item-content-style">
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">鎵规鍙凤細</view>
- <view class="content_list_item_content_item_nr">
- {{ item.batch ? item.batch : '-' }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">宸ュ簭锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ item.procedureName || '-' }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">璐ㄩ噺锛�</view>
- <view class="content_list_item_content_item_nr">
- <text v-if="item.qualityType==0" class="green">鍚堟牸</text>
- <text v-else-if="item.qualityType==1" class="yellow">涓嶈壇</text>
- <text v-else-if="item.qualityType==2" class="red">鎶ュ簾</text>
- <text v-else>-</text>
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">璁″垝杞簱鏁伴噺锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ item.outPlannum + item.unitName }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">瀹為檯杞嚭鏁伴噺锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ item.outActnum + item.unitName }}
- </view>
- </view>
- <view class="content_list_item_content_item">
- <view class="content_list_item_content_item_label">瀹為檯杞叆鏁伴噺锛�</view>
- <view class="content_list_item_content_item_nr">
- {{ item.inActnum + item.unitName }}
- </view>
- </view>
- </view>
- </view>
- </view>
- </view>
- <view v-if="(data.status === 0 || data.status === 1) && show" style="background:#F7F7F7; width: 100%; height: 188rpx"></view>
- <view v-if="(data.status === 0 || data.status === 1) && show" class="bottom-button">
- <button class="button" @click="submit">{{ data.status === 0 ? '鍘诲嚭搴�' : '鍘诲叆搴�' }}</button>
- </view>
- </view>
-</template>
-
-<script>
- import {
- wTransferExtDetail
- } from '@/util/api/materialStorage'
- export default {
- data() {
- return {
- id: null,
- types: [{
- name: '鍏ㄩ儴',
- id: '',
- isActive: true
- },
- {
- name: '閲囪喘璁㈠崟',
- id: '0',
- isActive: false
- },
- {
- name: '鐢熶骇宸ュ崟',
- id: '1',
- isActive: false
- },
- {
- name: '閿�鍞鍗�',
- id: '2',
- isActive: false
- },
- {
- name: '杞簱鍗�',
- id: '3',
- isActive: false
- },
- {
- name: '鐩樼偣鍗�',
- id: '4',
- isActive: false
- },
- ],
- data: {
- code: "",
- status: 0,
- outDepartName: "",
- inDepartName: "",
- outWarehouseName: "",
- inWarehouseName: "",
- outPlandate: "",
- inPlandate: "",
- wtransferDetailList: []
- },
- orderType: [{
- name: '杞﹂棿棰嗘枡',
- id: 1
- },
- {
- name: '璁″垝棰嗘枡',
- id: 2
- },
- {
- name: '鏈哄彴澶囨枡',
- id: 3
- },
- {
- name: '瀹屽伐鍏ュ簱',
- id: 4
- },
- {
- name: '杞﹂棿杞簱',
- id: 5
- },
- {
- name: '澶栧崗棰嗘枡杞簱',
- id: 6
- },
- {
- name: '澶栧崗瀹屽伐杞簱',
- id: 7
- },
- {
- name: '鎴愬搧鍏ュ簱',
- id: 8
- },
- {
- name: '鎴愬搧杞簱',
- id: 9
- },
- {
- name: '璁╂鏀捐鍏ュ簱',
- id: 10
- },
- {
- name: '璁╂鏀捐杞簱',
- id: 11
- },
- {
- name: '瀹㈣繑杩斾慨棰嗘枡',
- id: 12
- },
- {
- name: '瀹㈣繑杩斾慨鍏ュ簱',
- id: 13
- },
- {
- name: '璺ㄧ粍缁囪浆搴�',
- id: 14
- },
- {
- name: '宸ュ簭鎶ュ簾',
- id: 15
- },
- {
- name: '瀹㈤��杩斾慨棰嗘枡',
- id: 16
- },
- {
- name: '瀹㈤��杩斾慨鍏ュ簱',
- id: 17
- }
- ],
- show: false
- };
- },
- onLoad(option) {
- this.id = option.id
- wTransferExtDetail(option.id)
- .then(res => {
- this.data = res.data
- if (res.data.inUserId == this.$store.state.userInfo.id) {
- this.show = true
- }
- })
- },
- methods: {
- // 璺宠浆鍑哄簱鍏ュ簱
- submit() {
- if (this.data.status === 0) { // 鍑哄簱
- // router.push({ name: 'issueOperation', query: { id: route.query.id, type: 7 } })
- uni.navigateTo({
- url: `/pages_inspect/pages/OutOperation/OutOperation?id=${this.id}&type=7`
- });
- } else if (this.data.status === 1) { // 鍏ュ簱
- if (this.data.type === 3) { // 澶囨枡纭
- console.log('澶囨枡纭')
- // router.push({ name: 'orderStock', query: { id: route.query.id, status: data.value.status, next: 1 } })
- return
- }
- uni.navigateTo({
- url: `/pages_inspect/pages/InOperation/InOperation?id=${this.id}&type=7`
- });
- // router.push({ name: 'warehousing', query: { id: route.query.id, type: 7 } })
- }
- },
- tyepToStr(type) {
- for (const item of this.orderType) {
- if (item.id == type) {
- return item.name
- }
- }
- return '-'
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .content2 {
- background: white;
-
- .order-message {
- padding-top: 30rpx;
- // padding: 30rpx;
- display: flex;
- flex-direction: column;
-
- // border-bottom: 1rpx solid #ececec;
- .content_list_item_top {
- padding: 0 30rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- .content_list_item_top_left {
- display: flex;
- align-items: center;
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #333333;
- }
- }
-
- .content_list_item_top_right {
- font-size: 26rpx;
- font-weight: 400;
-
- .created {
- color: $nav-stateColor1 !important;
- }
-
- .warning {
- color: $nav-stateColor5 !important;
- }
-
- .green {
- color: $nav-stateColor6 !important;
- }
-
- .info {
- color: $nav-stateColor3 !important;
- }
- }
- }
-
- .material-title {
- // background-color: #f7f7f7;
- margin-top: 10rpx;
- }
-
- .content_list_item_content {
- margin: 0 30rpx;
- padding: 24rpx 30rpx;
- background: #f7f7f7;
- border-radius: 16rpx;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- margin-top: 32rpx;
-
- .content_list_item_content_item {
- width: 100%;
- display: flex;
- margin-top: 24rpx;
-
- // &:nth-child(1) {
- // margin-top: 0 !important;
- // }
- // &:nth-child(2) {
- // margin-top: 0 !important;
- // }
- .content_list_item_content_item_label {
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .content_list_item_content_item_nr {
- font-size: 24rpx;
- font-weight: 400;
- color: #222222;
- margin-right: 10rpx;
- }
- }
- }
- }
-
- .title {
- height: 32rpx;
- margin-left: 30rpx;
- padding-top: 40rpx;
- padding-bottom: 24rpx;
- font-size: 30rpx;
-
- .title-prefix {
- display: inline-block;
- background-color: #4275FC;
- height: 30rpx;
- width: 8rpx;
- border-radius: 1rpx;
- margin-right: 12rpx;
- }
- }
-
- .material-content {
- .item-style {
- width: initial;
- border-bottom: 1rpx solid #ECECEC;
- padding-bottom: 30rpx;
-
- &:last-child {
- border: none;
- }
-
- .item-title-style {
- padding: 0 30rpx;
- margin-top: 30rpx;
- margin-bottom: 12rpx;
- font-size: 30rpx;
- }
-
- .item-content-style {
- margin: 0 30rpx;
- background-color: #f7f7f7;
- border-radius: 16rpx;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- padding: 1rpx 1rpx 30rpx 1rpx;
-
- .content_list_item_content_item {
- width: 100%;
- display: flex;
- margin-top: 24rpx;
- margin-left: 24rpx;
-
- .content_list_item_content_item_label {
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .content_list_item_content_item_nr {
- font-size: 24rpx;
- font-weight: 400;
- color: #222222;
- margin-right: 10rpx;
- }
- }
- }
- }
- }
-
- .bottom-button {
- padding: 1rpx;
- background-color: #f7f7f7;
- position: fixed;
- width: 100%;
- bottom: 0;
- height: 188rpx;
-
- .button {
- margin: 32rpx 32rpx 68rpx 32rpx;
- height: 88rpx;
- font-size: 30rpx;
- width: calc(100% - 64rpx);
- border: none;
- border-radius: 8rpx;
- background-color: $nav-color;
- color: #fff;
- }
- }
- }
-</style>
\ No newline at end of file
diff --git a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue b/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
deleted file mode 100644
index 5803406..0000000
--- a/minipro_standard/pages_adjust/pages/workOrder/workOrder.vue
+++ /dev/null
@@ -1,486 +0,0 @@
-<template>
- <view class="content p30 bbox">
- <div class="content_search">
- <v-Search @searchInput="searchInput" @submit="search" @reset="reset" :isShow="true"
- placeholder="鎼滅储宸ュ崟缂栫爜/宸ュ簭鍚嶇О">
- <template v-slot:content>
- <div class="Search_item">
- <div class="Search_item_label">璁″垝鏃ユ湡</div>
- <div class="Search_item_content" @click="isOpenDate = true">
- <div class="Search_item_content_a" :style="searchForm.startDate ? 'color: #000;' : ''">
- {{ searchForm.startDate ? searchForm.startDate : '寮�濮嬫棩鏈�'}}
- </div>
- <span>-</span>
- <div class="Search_item_content_a" :style="searchForm.endDate ? 'color: #000;' : ''">
- {{ searchForm.endDate ? searchForm.endDate : '缁撴潫鏃ユ湡'}}
- </div>
- </div>
- </div>
- </template>
- </v-Search>
- <div class="content_search_x"></div>
- <v-LableSelection :TagList="tagList" :isShow="true" @change="clickTag"></v-LableSelection>
- </div>
- <div class="content_total mt20">鍏眥{page.total}}鏉℃暟鎹�</div>
- <div class="content_list">
- <scroll-view scroll-y="true" :style="{height:height}" refresher-enabled="true"
- :refresher-triggered="triggered" @scrolltolower="getLists" @refresherrefresh="onRefresh">
-
- <div class="content_list_item" v-for="(item, i) in list" :key="i" @click="jump(item)">
- <div class="content_list_item_top">
- <div class="content_list_item_top_left">
- <span class="f32" v-if="item.mmodel">{{item.mmodel.name}} | {{item.procedureName}}</span>
- <div class="content_list_item_top_left_tag" v-if="item.urgent">浼樺厛{{item.urgent}}</div>
- <div class="content_list_item_top_left_tag backgreen" v-if="item.type === 0">姝ｅ父</div>
- <div class="content_list_item_top_left_tag backyellow" v-if="item.type === 2">杩斿伐杩斾慨</div>
- <div class="content_list_item_top_left_tagW" v-if="item.paused === 1">鍋�</div>
- </div>
- <div class="content_list_item_top_right">
- <span class="yellow" v-if="item.status === 0">宸插垱寤�</span>
- <span class="green" v-if="item.status === 1">宸插鏂�</span>
- <span v-if="item.status === 2">宸插畬宸ユ</span>
- <span class="purple" v-if="item.status === 3">宸叉楠�</span>
- <span v-if="item.status === 4">宸叉姤宸�</span>
- <span v-if="item.status === 5">宸插叆搴�</span>
- <span v-if="item.status === 6">宸插彇娑�</span>
- <span class="green" v-if="item.status === 7">鐢熶骇涓�</span>
- </div>
- </div>
- <span class="f24">宸ュ崟缂栧彿: {{item.code}}</span>
- <div class="content_list_item_content">
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">鐗╂枡缂栫爜锛�</div>
- <div class="content_list_item_content_item_nr" v-if="item.mmodel">{{item.mmodel.code}}</div>
- </div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">璁″垝寮�宸ワ細</div>
- <div class="content_list_item_content_item_nr">{{item.planDate}}</div>
- </div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">鐢熶骇鎵规锛�</div>
- <div class="content_list_item_content_item_nr">{{item.batch}}</div>
- </div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">璁″垝鏁伴噺锛�</div>
- <div class="content_list_item_content_item_nr" v-if="item.umodel">
- {{item.planNum}}{{item.umodel.name}}
- </div>
- </div>
- <div class="content_list_item_content_item">
- <div class="content_list_item_content_item_label">鐢熶骇璁惧锛�</div>
- <div class="content_list_item_content_item_nr" v-if="item.pgmodel">{{item.pgmodel.code}}
- </div>
- </div>
-
- <div class="content_list_item_content_item" v-if="item.status === 5">
- <div class="content_list_item_content_item_label">瀹屽伐鏁伴噺锛�</div>
- <div class="content_list_item_content_item_nr">{{item.proNum}}</div>
- </div>
- </div>
- </div>
-
- </scroll-view>
- </div>
- <view class="fx1">
-
- </view>
-
- <!-- <u-calendar :show="isOpenDate" mode="range" @confirm="dateConfirm"></u-calendar> -->
- <l-calendar :lunar="false" v-model="isOpenDate" @change="dateConfirm" :isRange="true" activeBgColor="#305ED5"
- rangeColor="#305ED5" rangeBgColor="rgba(48, 80, 213, 0.1)"></l-calendar>
- </view>
-</template>
-
-<script>
- import vSearch from '@/components/Search.vue'
- import vLableSelection from '@/components/LabelSelection.vue'
- import {
- getList,
- pageCount
- } from '@/util/api/WorkOrderAPI.js'
- import {
- gsdate
- } from '@/util/utils.js'
- export default {
- components: {
- vSearch,
- vLableSelection
- },
- data() {
- return {
- isOpenDate: false,
- tagList: [{
- id: [0, 1],
- name: '寰呯敓浜�',
- num: '0'
- },
- {
- id: [2, 3, 7],
- name: '鐢熶骇涓�',
- num: '0'
- },
- {
- id: [4, 5, 6],
- name: '宸插畬鎴�',
- num: '0'
- }
- ],
- height: '',
- triggered: false,
- _freshing: false,
- searchForm: {
- mixParam: '',
- startDate: '',
- endDate: gsdate(new Date()),
- statusList: []
- },
- page: {
- total: 0,
- capacity: 10,
- page: 1
- },
- list: [],
- }
- },
- onReady() {
- var that = this
-
- this.$nextTick(() => {
- uni.createSelectorQuery()
- .in(this)
- .select('.content_search')
- .boundingClientRect((rect) => {
- console.log('-----', rect);
- that.height = `calc(100vh - ${rect.height + 80}px)`
- that.top = `${rect.height}px`
- })
- .exec()
- })
- },
- onLoad() {
- this.pageCounts()
- this.loadData()
- },
- methods: {
- reset() {
- this.searchForm = {
- mixParam: '',
- startDate: '',
- // endDate: gsdate(new Date()),
- endDate: '',
- statusList: []
- }
- this.search()
- },
- searchInput(data) {
- this.searchForm.mixParam = data
- this.search()
- },
- loadData() {
- getList({
- ...this.page,
- model: {
- ...this.searchForm,
- endDate: this.searchForm.endDate ? (this.searchForm.endDate + ' 23:59:59') : '',
- statusList: this.searchForm.statusList.length === 0 ? this.tagList[0].id : this.searchForm
- .statusList
- }
- })
- .then(res => {
- let {
- data
- } = res
-
- if (data.page == 1) {
- this.list = []
- }
- this.page.total = data.total
- this.page.page = data.page
- this.list.push(...data.records)
- this.triggered = false
- })
- },
- pageCounts() {
- pageCount({
- ...this.searchForm,
- endDate: this.searchForm.endDate || null,
- statusList: this.searchForm.statusList.length === 0 ? this.tagList[0].id : this.searchForm
- .statusList
- }).then(res => {
- if (res.code === 200) {
- this.tagList[0].num = String(res.data.startNum)
- this.tagList[1].num = String(res.data.ingNum)
- this.tagList[2].num = String(res.data.endNum)
- }
- })
- },
- clickTag(v) {
- this.searchForm.statusList = v
- this.page.page = 1
- this.loadData()
- },
- dateConfirm(v) {
- console.log(v);
- this.isOpenDate = false
- this.searchForm.startDate = v.startDate
- this.searchForm.endDate = v.endDate
- },
- getLists() {
- this.page.page += 1
- this.loadData()
- },
- onRefresh() {
- if (this.triggered) return
- this.triggered = true;
- this.search()
- },
- search() {
- this.page.page = 1
- this.loadData()
- this.pageCounts()
- },
- jump(item) {
- // uni.navigateTo({
- // url: `/pages_adjust/pages/OrderDetail/OrderDetail?id=${item.id}`
- // })
- if (item.status === 4 || item.status === 6 || item.paused === 1) {
- uni.navigateTo({
- url: `/pages_adjust/pages/OrderDetail/OrderDetail?id=${item.id}`
- })
- } else {
- uni.navigateTo({
- url: `/pages_adjust/pages/workOrderReporting/workOrderReporting?id=${item.id}`
- })
- }
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .content {
- display: flex;
- flex-direction: column;
- height: 100vh;
-
- .content_search {
- background: white;
- z-index: 9;
-
- .Search_item {
- margin-bottom: 40rpx;
-
- .Search_item_label {
- font-size: 30rpx;
- font-weight: 500;
- color: #222222;
- }
-
- .Search_item_content {
- display: flex;
- align-items: center;
- justify-content: space-between;
- margin-top: 30rpx;
-
- .tag {
- display: flex;
- flex-wrap: wrap;
- align-items: center;
-
- .tag_active {
- background: $nav-color !important;
- color: #ffffff !important;
- }
-
- .tag_item {
- width: 156rpx;
- height: 70rpx;
- box-sizing: border-box;
- background: #F2F2F2;
- border-radius: 8rpx;
- font-size: 26rpx;
- font-weight: 400;
- color: #333333;
- display: flex;
- align-items: center;
- justify-content: center;
- margin-right: 22rpx;
- margin-bottom: 22rpx;
-
- &:nth-child(4n) {
- margin-right: 0;
- }
- }
- }
-
- span {
- font-size: 26rpx;
- font-weight: 400;
- color: #333333;
- }
-
- .Search_item_content_a {
- width: 308rpx;
- height: 70rpx;
- background: #F7F7F7;
- border-radius: 8rpx;
- border: 1rpx solid #EEEEEE;
- font-size: 26rpx;
- font-weight: 400;
- color: #B2B2B2;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- }
-
- .content_search_x {
- height: 24rpx;
- }
- }
-
- .content_total {
- padding: 24rpx 30rpx;
- background: #F7F7F7;
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- }
-
- .content_list {
- width: 100%;
- height: 100%;
- display: flex;
- flex-direction: column;
-
- .content_list_item {
- background: white;
- padding: 30rpx;
- display: flex;
- flex-direction: column;
- border-bottom: 1rpx solid #ececec;
-
- span {
- color: #5a5a5a;
- margin-top: 15rpx;
- }
-
- .content_list_item_top {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- .content_list_item_top_left {
- display: flex;
- align-items: center;
- width: 80%;
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #333333;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- -o-text-overflow: ellipsis;
- }
-
- .content_list_item_top_left_tagW {
- margin-top: 14rpx;
- flex-shrink: 0;
- box-sizing: border-box;
- padding: 5rpx 10rpx;
- background: $nav-stateColor5;
- border-radius: 8rpx;
- font-size: 22rpx;
- font-weight: 400;
- color: #FFFFFF;
- margin-left: 16rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- }
-
- .content_list_item_top_left_tag {
- margin-top: 14rpx;
- flex-shrink: 0;
- padding: 5rpx 10rpx;
- background: $nav-stateColor4;
- border-radius: 8rpx;
- font-size: 22rpx;
- font-weight: 400;
- color: #FFFFFF;
- margin-left: 16rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
-
- .content_list_item_top_right {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
-
- .purple {
- color: $nav-color !important;
- }
-
- .green {
- color: $nav-stateColor6 !important;
- }
-
- .yellow {
- color: $nav-stateColor1 !important;
- }
- }
- }
-
- .content_list_item_content {
- padding: 24rpx 30rpx;
- background: #F7F7F7;
- border-radius: 16rpx;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- margin-top: 25rpx;
-
- .content_list_item_content_item {
- width: 50%;
- display: flex;
- margin-top: 24rpx;
-
- &:nth-child(1) {
- margin-top: 0 !important;
- }
-
- &:nth-child(2) {
- margin-top: 0 !important;
- }
-
- .content_list_item_content_item_label {
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .content_list_item_content_item_nr {
- flex: 1;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- -o-text-overflow: ellipsis;
- font-size: 24rpx;
- font-weight: 400;
- color: #222222;
- margin-right: 10rpx;
- }
- }
- }
- }
- }
- }
-</style>
diff --git a/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue b/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
deleted file mode 100644
index 1440aec..0000000
--- a/minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue
+++ /dev/null
@@ -1,1580 +0,0 @@
-<template>
- <page-meta :page-style="(badShow||statistics) ?'overflow: hidden;': ''"/>
- <view class="content">
- <view class="tips-label">褰撳墠浠诲姟闇�瑕佽川妫�锛涗骇鍑哄悗锛岃鑰愬績绛夊緟璐ㄦ鍛樻楠岋紝骞舵牴鎹楠岀粨鏋滆皟鏁翠骇鍑烘暟鎹悗鍐嶆姤宸ャ��</view>
- <workOrderInfo :orederMessage="info" />
- <!-- <u-tabs :list="tab" lineColor="#305ED5" :activeStyle="{color:'#305ED5'}" lineWidth="50%" :itemStyle="{width: '50%', boxSizing: 'border-box', height: '88rpx'}" @click="click"></u-tabs> -->
- <view class="bg_cate">
- <view @click="clickIten(index)" :class="typeView == index ? 'bg_cate_item active' : 'bg_cate_item'"
- v-for="(item, index) in cate" :key="index">{{ item.name }}</view>
- </view>
- <div class="bg_list" v-if="typeView === 0">
- <div class="bg_list_item">
- <div class="bg_list_item_top">
- <div class="bg_list_item_top_left">
- <div class="bg_list_item_top_left_x bg_m"></div>
- <span>鎶曟枡鏄庣粏</span>
- </div>
- <!-- proxy.$auth('h5:workorderinput:create') && -->
- <div class="bg_list_item_top_right" @click="jumpTL"
- v-if="info.bomType !== 1 || info.bomType == 0 || !info.bomType">
- <!-- v-if="proxy.$auth('h5:workorderinput:create') && (info.bomType !== 1 || info.bomType == 0 || !info.bomType)" -->
- <!-- <img src="@/assets/icon/gongdan_ic_shoudong@2x.png" alt="" /> -->
- <!-- <img src="@/static/gongdan_ic_shoudong@2x.ong" alt="" /> -->
- <image src="../../static/gongdan_ic_shoudong@2x.png" class="img28" mode=""></image>
- <span class="cm">鎵嬪姩鎶曟枡</span>
- </div>
- </div>
-
- <template v-if="feedingData && feedingData.length > 0">
- <u-swipe-action>
- <u-swipe-action-item v-for="(item, index) in feedingData" :key="index" :options="options"
- @click="deleItem(item.id, 'T')">
- <div class="bg_list_item_h">
- <div class="bg_list_item_num">
- <div class="bg_list_item_num_item">
- <!-- <span>{{item.code}}</span> -->
- <div class="bg_list_item_num_item_wl">
- <span> {{ item.materialName || '澧欎綋鐮�' }}{{ item.procedureName ? ` | ${item.procedureName}` : ''
- }}</span>
- <div class="bg_list_item_num_item_wl_lx">
- <span class="green" v-if="item.qualityType == 0">鍚堟牸<text class="c6" decode>{{split}}</text></span>
- <span class="orange" v-if="item.qualityType == 1">涓嶈壇<text class="c6" decode>{{split}}</text></span>
- <span class="red" v-if="item.qualityType == 2">鎶ュ簾<text class="c6" decode>{{split}}</text></span>
- <span>{{ item.locationName }}</span>
- <span v-if="item.batch"><text class="c6" decode>{{split}}</text>{{ item.batch }}</span>
- </div>
- </div>
- <div class="bg_list_item_num_item_sr">
- <!-- :disabled="!proxy.$auth('h5:workorderinput:update')" -->
- <input v-model="item.num"
- @blur="change(item.id, item.num, 'T', item.maxNum, item, item.unitAttribute)"
- type="number" />
- <span>{{ item.unitName }}</span>
- </div>
- </div>
- </div>
- </div>
- </u-swipe-action-item>
- </u-swipe-action>
-
- </template>
- <template v-else>
- <div class="kong">
- <span>鏆傛棤鏁版嵁</span>
- </div>
- </template>
- </div>
- <div class="bg_list_item">
- <div class="bg_list_item_top">
- <div class="bg_list_item_top_left">
- <div class="bg_list_item_top_left_x bg_m"></div>
- <span>浜у嚭鏄庣粏</span>
- </div>
- </div>
- <div class="bg_list_item_h">
- <div class="bg_list_item_num">
- <div class="bg_list_item_num_item">
- <span>鑹搧鏁皗{ info.umodel ? `(${info.umodel.name})` : '' }}</span>
- <div class="bg_list_item_num_item_sr">
- <!-- :disabled="!proxy.$auth('h5:workorderoutput:update')" -->
- <!-- @blur="change(item.id, item.num, 'C', item.maxNum, item)" -->
- <input type="number" v-model="produceFrom.qualified"
- @blur="changeCC('0', produceFrom.qualified, produceFrom.qualifiedId)"
- placeholder="璇疯緭鍏�" />
- <span v-if="info.umodel">{{ info.umodel.name }}</span>
- </div>
- </div>
- </div>
- </div>
- <div class="bg_list_item_h">
- <div class="bg_list_item_num">
- <!-- @blur="change(item.id, item.num, 'C', item.maxNum, item)" -->
- <div class="bg_list_item_num_item">
- <span>涓嶈壇鏁皗{ info.umodel ? `(${info.umodel.name})` : '' }}</span>
- <div class="bg_list_item_num_item_sr">
- <!-- :disabled="!proxy.$auth('h5:workorderoutput:update')" -->
- <!-- @blur="change(item.id, item.num, 'C', item.maxNum, item)" -->
- <input type="number" v-model="produceFrom.undesirable"
- @blur="changeCC('1', produceFrom.undesirable, produceFrom.undesirableId)"
- placeholder="璇疯緭鍏�" />
- <span v-if="info.umodel">{{ info.umodel.name }}</span>
- </div>
- </div>
- </div>
- </div>
- <div class="bg_list_item_h" v-if="produceFrom.undesirable > 0">
- <div class="bg_list_item_num">
- <div class="bg_list_item_num_item" @click="badShow = true">
- <span>涓嶈壇椤�</span>
- <div class="bg_list_item_num_item_sr">
- <span class="wulll" :style="{ color: form.defectiveName ? '#305ED5' : '' }">{{ form.defectiveName ?
- form.defectiveName : '璁剧疆' }}</span>
- <image src="../../../static/ic_ar@2x.png" class="img_ar" mode=""></image>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="bg_plan" @click="TimeShow = true">
- <div class="bg_plan_label">
- <span>鎶ュ伐鏃堕暱</span>
- </div>
- <div class="bg_plan_label_val">
- <span
- :style="{ color: form.durationName ? '#333' : '' }">{{ form.durationName ? form.durationName : '璇烽�夋嫨' }}</span>
- <image src="../../../static/ic_ar@2x.png" class="img_ar" mode=""></image>
- </div>
- </div>
- <!-- form.duration && -->
- <div class="bg_list_item" v-if="arrType && arrType.length > 0">
- <div class="bg_list_item_top">
- <div class="bg_list_item_top_left">
- <div class="bg_list_item_top_left_x bg_m"></div>
- <span>宸ヨ祫缁╂晥</span>
- </div>
- </div>
- <div class="bg_list_item_h">
- <div class="bg_list_item_num">
- <div class="bg_list_item_num_item">
- <span>璁′欢鏂瑰紡</span>
- <div class="bg_list_item_num_item_list">
- <div :class="form.index == index ? 'bg_list_item_num_item_list_item active' : 'bg_list_item_num_item_list_item'"
- v-for="(item, index) in arrType" :key="index"
- @click="clickPerformanceType(item, index)">
- {{ item.name }}
- </div>
- </div>
- </div>
- </div>
- <div class="bg_list_item_num">
- <div class="bg_list_item_num_item">
- <span>宸ヨ祫鍗曚环</span>
- <div class="bg_list_item_num_item_sr">
- <span class="color1">{{ (arrType[form.index].salary / 10 / 10).toFixed(2) }}鍏�/{{ arrType[form.index].type ==
- 0 ? '浠�' : '鏃�' }}</span>
- </div>
- </div>
- </div>
- <div class="bg_list_item_num">
- <div class="bg_list_item_num_item">
- <span>棰勮宸ヨ祫</span>
- <div class="bg_list_item_num_item_sr">
- <span class="color1">{{ expectedSalary }}鍏�</span>
- </div>
- </div>
- </div>
- <div class="bg_list_item_num">
- <div class="bg_list_item_num_item">
- <span>杈炬爣鐜�</span>
- <div class="bg_list_item_num_item_sr">
- <span class="color1">{{ complianceRate }}%</span>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- <div class="details_dj" v-if="typeView === 1">
-
- <div class="details_dj_list">
- <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>
- </div>
- </div>
- <!-- v-if="info.status === 2 || info.procedureNeedcheck === 1" -->
- <!-- status 0宸插垱寤恒��1宸插鏂欍��2宸插畬宸ャ��3宸叉楠屻��4宸叉姤宸ャ��5宸插叆搴撱��6宸插彇娑堛��7鐢熶骇涓� -->
- <!-- procedureNeedcheck 宸ュ簭鏄惁闇�瑕佹楠屾墠鑳芥姤宸� 0鏄� 1鍚� -->
- <template v-if="typeView == 0 &&( info.status === 2 || info.procedureNeedcheck === 1 )">
- <div class="bh_zw"></div>
- <div class="bg_footer bg_f7">
- <div class="bg_footer_submit bg_m" v-if="typeView == 0" @click="submit">纭鎶ュ伐</div>
- <!-- proxy.$auth('h5:workorder:processRecord') && -->
-
- </div>
- </template>
- <template v-if="typeView == 1 && info.status !== 4 && info.procedureNeedcheck !== 5 && info.procedureNeedcheck !== 6">
- <div class="bh_zw"></div>
- <div class="bg_footer bg_f7">
- <div class="bg_footer_submit1" @click="jumpdj" v-if="typeView == 1">
- <image src="../../../static/gongdan_ic_shoudong@2x.png" class="fornt-img" mode=""></image>
- <span>鏂板鐐规</span>
- </div>
- </div>
- </template>
- <u-safe-bottom></u-safe-bottom>
- <u-datetime-picker :show="TimeShow" @cancel="TimeShow=false" @confirm="timeConfirm" v-model="form.time"
- mode="time"></u-datetime-picker>
- <u-popup :show="badShow" @close="badShow=false" :round="8" closeable zIndex="20000">
- <view class="rp p40 contanir">
- <view class="c2 b tc">涓嶈壇椤�</view>
- <view class="content bl_list">
- <div class="bl_list_item" v-for="(item, i) in cateList" :key="i" @click="changeChecked(i)">
- <div class="bl_list_item_left">
- <u-checkbox-group @change="changeChecked(i)">
- <u-checkbox :key="index" :checked="item.active" :label="item.name" :name="item.name">
- </u-checkbox>
- </u-checkbox-group>
- </div>
- <div class="bl_list_item_right">
- <input type="number" @click.stop v-model="item.num" placeholder="0" />
- </div>
- </div>
- </view>
- <view class="flex ap tc bottom-view">
- <view class="fx1 ml20 ptb20 sbtn_green" @click="confirm">纭畾</view>
- </view>
- </view>
- </u-popup>
- <u-popup :show="statistics" @close="statistics=false" :round="8" closeable zIndex="20000">
- <div class="tg">
- <div class="tg_header">璇风‘璁ゆ姤宸ヤ俊鎭�</div>
- <div class="tg_table">
- <div class="tg_table_header">
- <div class="tg_table_header_item">绫诲瀷</div>
- <div class="tg_table_header_item">鐗╂枡鍚嶇О</div>
- <!-- <div class="tg_table_header_item">宸ヨ鏁伴噺</div> -->
- <div class="tg_table_header_item">鐗╂枡鏁伴噺</div>
- </div>
- <div class="nr" v-if="statisticsData.length > 0">
- <div class="tg_table_nr" v-for="(item, index) in statisticsData" :key="index">
- <div class="tg_table_nr_item">{{ item.name }}</div>
- <div class="tg_table_nr_item">{{ item.materialName }}</div>
- <!-- <div class="tg_table_nr_item">{{item.gznum}}</div> -->
- <div class="tg_table_nr_item" :style="item.name === '宸ュ崟鏈姇鏂�' ? 'color: #DE5243' : ''">
- {{ item.num }}
- </div>
- </div>
- </div>
- <div class="nr" v-else>
- <div class="tg_table_nr">
- <div class="tg_table_nr_item1">鏆傛棤鏁版嵁</div>
- </div>
- </div>
- </div>
- <div class="tg_footer">
- <!-- proxy.$auth('h5:workorderoutput:confirm') && -->
- <button class="tg_footer_qr" @click="submitBG" v-if="isSubmit">纭鎶ュ伐</button>
- <div class="tg_footer_fh" @click="statistics = false" v-else-if="!isSubmit">杩斿洖淇敼</div>
- </div>
- </div>
- </u-popup>
- </view>
-</template>
-
-<script>
- import workOrderInfo from '@/components/workOrderInfo.vue'
- import {
- getBarcodeContent,
- queryById,
- getOrocessRecord,
- deleteCT,
- updateById,
- comfirmDone,
- comfirmDoneStandard,
- getListByCondition,
- allForStandard,
- pageDJ,
- deletedj,
- dealWorkorderRecordStandard,
- getWorkorderRecordListStandard
- } from '@/util/api/WorkOrderAPI'
- import {
- categoryExtList,
- queryOne,
- queryList
- } from '@/util/api/PlanningAPI'
- import {
- REGULAR
- } from '@/util/utils'
- export default {
- components: {
- workOrderInfo
- },
- data() {
- return {
- cate: [{
- name: '鐢熶骇'
- },
- {
- name: '鐐规'
- }
- ],
- split: ' / ',
- form: {
- time: '',
- defective: [],
- defectiveName: '',
- durationName: '0灏忔椂0鍒嗛挓',
- duration: 0,
- type: 0,
- index: 0
- },
- TimeShow: false,
- badShow: false,
- typeView: 0,
- workorderId: '',
- info: {},
- feedingData: [],
- options: [{
- text: '鍒犻櫎',
- style: {
- backgroundColor: 'red',
- }
- }],
- arrType: [],
- // 浜у嚭鍚堟牸/涓嶈壇
- produceFrom: {
- qualifiedId: '',
- qualified: '', // 鍚堟牸
- undesirableId: '',
- undesirable: '' // 涓嶈壇
- },
- triggered: false,
- finished: true,
- djData: [],
- cateList: [],
- pages: {
- capacity: 10,
- page: 1,
- total: 0
- },
- statisticsData: [],
- isSubmit: false,
- statistics: false
- };
- },
- onLoad(obj) {
- this.workorderId = obj.id
- this.queryByIds()
- this.getOrocessRecords()
- this.getData()
- this.pageDJs()
- uni.$on('spotAdd', () => {
- if (this.typeView == 1) {
- this.pages.page = 1
- this.pageDJs()
- }
- })
- uni.$on('addMaterial', () => {
- this.getOrocessRecords()
- })
- },
- computed: {
- expectedSalary() {
- let { qualified, undesirable } = this.produceFrom
- if (this.arrType.length === 0) return 0;
- let temp = this.arrType[this.form.index]
- // 鎸変欢璁＄畻
- if (temp.type == 0) {
- if (!qualified) return 0
- if (temp.unqualified == 1) { // 鏄惁璁″叆涓嶈壇鍝�
- let total = Number(qualified) + Number(undesirable)
- return (total * (temp.salary / 100)).toFixed(2) || 0
- } else {
- return (Number(qualified) * (temp.salary / 100)).toFixed(
- 2) || 0
- }
- } else {
- if (!this.form.duration) return 0;
- let h = (this.form.duration / 60 / 60).toFixed(2)
- return (Number(h) * (temp.salary / 10 / 10)).toFixed(2) || 0
- }
- },
- complianceRate() {
- let { index, duration } = this.form
- let { qualified, undesirable } = this.produceFrom
- if (this.arrType.length === 0) return 0;
- let temp = this.arrType[index]
- if (!qualified && !undesirable) return 0;
- if (!duration) return 0;
- if (!temp.num || !temp.times) return 0;
- // 鎸変欢璁＄畻
- // if (infoBox.value.type == 0) {
- if (temp.unqualified == 1) { // 鏄惁璁″叆涓嶈壇鍝�
- let a = ((Number(qualified) + Number(undesirable)) / (Number(duration) / 3600)).toFixed(2)
- let b = (temp.num / (temp.times / 3600)).toFixed(2)
- 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 {
- let a = (Number(qualified) / (Number(duration) / 3600)).toFixed(2)
- let b = (temp.num / (temp.times / 3600)).toFixed(2)
- return ((Number(a) / Number(b)) * 100).toFixed(2)
- // return Number(from.qualified) * infoBox.value.salary;
- }
- }
- },
- methods: {
- 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
- }
- })
- },
- getData() {
- categoryExtList({
- cateType: "3"
- }).then(res => {
- if (res.code === 200) {
- res.data.forEach(item => {
- item.active = false
- item.num = ''
- })
- this.cateList = res.data
- }
- })
- },
- click() {
-
- },
- clickIten(index) {
- this.typeView = index
- if (this.typeView == 1) {
- this.pages.page = 1
- this.pageDJs()
- }
- },
- timeConfirm({
- value
- }) {
- let h = Number(value.substring(0, 2))
- let m = Number(value.substring(3, 5))
- let s = 0
- if (h > 0) {
- s += h * 60 * 60
- }
- if (m > 0) {
- s += m * 60
- }
- this.form.duration = s
- this.form.durationName = `${h}灏忔椂${m}鍒嗛挓`
- this.TimeShow = false
- },
- // 缂栬緫鎶曟枡/浜у嚭
- change(id, num, type, maxNum, item, unitAttribute) {
- let obj = item
- if (type === 'T') {
- if (unitAttribute == 0 && num != '') {
- if (!REGULAR.positiveInteger.test(num)) {
- obj.num = obj.ynum
- uni.$u.toast('鍙兘杈撳叆姝ｆ暣鏁�')
- return
- }
- }
- if (unitAttribute == 1 && num != '') {
- if (!REGULAR.number.test(num)) {
- uni.$u.toast('鍙兘杈撳叆姝ｆ暣鏁版垨灏忔暟锛堟渶澶氬洓浣嶏級')
- obj.num = obj.ynum
- return
- }
- }
- if (num > maxNum) {
- obj.num = obj.ynum
- uni.$u.toast('瓒呭嚭宸ヨ鎬绘暟')
- return
- }
- } else if (type === 'C' && num > info.value.planNum) {
- obj.num = obj.ynum
- uni.$u.toast('浜у嚭鏁伴噺涓嶈兘瓒呰繃璁″垝鏁伴噺')
- return
- }
- updateById({
- id,
- num
- })
- .then(res => {
- if (res.code === 200 && type === 'T') {
- this.getOrocessRecords()
- }
- })
- },
- changeCC(downType, num, recordId) {
- if (!num) return
- if ((Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable)) > this.info.planNum) {
- uni.showToast({
- title: '浜у嚭鏁伴噺涓嶈兘澶т簬璁″垝鏁伴噺',
- duration: 2000,
- icon: 'none'
- })
- return
- }
- if (num >= 0) {
- this.form.defective = []
- this.form.defectiveName = ''
- // dealWorkorderRecordStandard({
- // downType, num, recordId, workorderId: route.query.id
- // }).then(res => {
- // if (res.code === 200) {
- // getOrocessRecordCC()
- // }
- // })
- } else {
- if (downType == 0) {
- this.produceFrom.qualified = 0
- } else {
- this.produceFrom.undesirable = 0
- }
- uni.showToast({
- title: '浜у嚭鏁伴噺涓嶈兘灏忎簬',
- duration: 2000,
- icon: 'none'
- })
- }
- },
- clickPerformanceType(item, index) {
- this.form.index = index
- this.form.type = item.type
- },
- getGroupNum(arr) {
- let newArry = {};
- for (let i = 0; i < arr.length; i++) {
- if (newArry[arr[i].materialName]) {
- newArry[arr[i].materialName].push(arr[i])
- } else {
- newArry[arr[i].materialName] = [arr[i]]
- }
- }
- return newArry;
- },
- submit() {
- let res = this.getGroupNum(this.feedingData)
- if (this.info.bomType === 1) { // 鎷夊紡
- console.log('鎷夊紡')
- this.statisticsData = []
- if (this.produceFrom.qualified <= 0 && this.produceFrom.undesirable <= 0) {
- uni.$u.toast('浜у嚭鏄庣粏涓嶈兘涓虹┖')
- return
- }
- if (this.info.hasBom === 0) {
- console.log('鏃燽om')
- let arr = []
- let tl = 0
- for (let i in res) {
- let num = 0
- res[i].forEach(item => {
- num += Number(item.num)
- })
- arr.push({
- name: '宸ュ崟鎶曟枡',
- materialName: i + res[i][0].procedureName,
- num: num
- })
- }
- this.feedingData.forEach(item => {
- tl += Number(item.num)
- })
- this.statisticsData = [...this.statisticsData, ...arr]
- this.statisticsData.push({
- name: '宸ュ崟鍚堟牸浜у嚭',
- materialName: this.info.mmodel.name + '-' + this.info.procedureName,
- num: this.produceFrom.qualified
- })
- this.infostatisticsData.push({
- name: '宸ュ崟涓嶈壇浜у嚭',
- materialName: this.info.mmodel.name + '-' + this.info.procedureName,
- num: this.produceFrom.undesirable
- })
- this.statisticsData.push({
- name: '宸ュ崟鏈姇鏂�',
- materialName: '',
- num: this.info.planNum - Number(this.produceFrom.qualified) - Number(this.produceFrom
- .undesirable)
- })
- let total = this.info.planNum - (Number(this.produceFrom.qualified) + Number(this.produceFrom
- .undesirable))
- if (total === 0) {
- this.isSubmit = true
- } else {
- this.isSubmit = false
- }
- } else if (this.info.hasBom === 1) { // 鏈塨om鎯呭喌
- console.log('鏈塨om')
- let arr = []
- let tl = 0
- // let res = getGroupNum(feedingData)
- for (let i in res) {
- let num = 0
- res[i].forEach(item => {
- num += Number(item.num)
- })
- arr.push({
- name: '宸ュ崟鎶曟枡',
- materialName: i,
- num: num
- })
- }
- this.feedingData.forEach(item => {
- tl += Number(item.num)
- })
- this.statisticsData = [...this.statisticsData, ...arr]
- this.statisticsData.push({
- name: '宸ュ崟鍚堟牸浜у嚭',
- materialName: this.info.mmodel.name + '-' + this.info.procedureName,
- num: this.produceFrom.qualified
- })
- this.statisticsData.push({
- name: '宸ュ崟涓嶈壇浜у嚭',
- materialName: this.info.mmodel.name + '-' + this.info.procedureName,
- num: this.produceFrom.undesirable
- })
- this.isSubmit = Number(this.produceFrom.qualified) + Number(this.produceFrom.undesirable) <= this
- .info.planNum;
- }
-
- } else {
- console.log('鎺ㄥ紡')
- if (this.feedingData.length === 0) {
- uni.$u.toast('鎶曟枡鏄庣粏涓嶈兘涓虹┖')
-
- return
- }
- if (this.produceFrom.qualified <= 0 && this.produceFrom.undesirable <= 0) {
- uni.$u.toast('浜у嚭鏄庣粏涓嶈兘涓虹┖')
- return
- }
- this.statisticsData = []
- if (this.info.hasBom === 0) {
- console.log('鏃燽om')
- let arr = []
- let tl = 0
- for (let i in res) {
- let num = 0
- res[i].forEach(item => {
- num += Number(item.num)
- })
- arr.push({
- name: '宸ュ崟鎶曟枡',
- materialName: i + '-' + res[i][0].procedureName,
- num: num
- })
- }
- this.feedingData.forEach(item => {
- tl += Number(item.num)
- })
- this.statisticsData = [...this.statisticsData, ...arr]
- this.statisticsData.push({
- name: '宸ュ崟鍚堟牸浜у嚭',
- materialName: this.info.mmodel.name + '-' + this.info.procedureName,
- num: this.produceFrom.qualified
- })
- this.statisticsData.push({
- name: '宸ュ崟涓嶈壇浜у嚭',
- materialName: this.info.mmodel.name + '-' + this.info.procedureName,
- num: this.produceFrom.undesirable
- })
- if (Number(tl) <= this.info.planNum) {
- let total = Number(tl) - Number(this.produceFrom.qualified) - Number(this.produceFrom
- .undesirable) // 鏄惁鏈変綑
- this.statisticsData.push({
- name: '宸ュ崟鏈姇鏂�',
- materialName: '',
- num: (Number(tl) - Number(this.produceFrom.qualified) - Number(this.produceFrom
- .undesirable))
- .toFixed(2)
- })
- if (total === 0) {
- this.isSubmit = true
- } else {
- this.isSubmit = false
- }
- } else {
- this.isSubmit = false
- }
- } else if (this.info.hasBom === 1) { // 鏈塨om鎯呭喌
- console.log('鏈塨om')
- let arr = []
- let tl = 0
- for (let i in res) {
- let num = 0
- res[i].forEach(item => {
- num += Number(item.num)
- })
- arr.push({
- name: '宸ュ崟鎶曟枡',
- materialName: i,
- num: num
- })
- }
- this.feedingData.forEach(item => {
- tl += Number(item.num)
- })
- this.statisticsData = [...this.statisticsData, ...arr]
- this.statisticsData.push({
- name: '宸ュ崟鍚堟牸浜у嚭',
- materialName: this.info.mmodel.name + '-' + this.info.procedureName,
- num: this.produceFrom.qualified
- })
- this.statisticsData.push({
- name: '宸ュ崟涓嶈壇浜у嚭',
- materialName: this.info.mmodel.name + '-' + this.info.procedureName,
- num: this.produceFrom.undesirable
- })
- // isSubmit.value = produceFrom.qualified + produceFrom.undesirable <= info.value.planNum;
- this.isSubmit = true
- }
- }
- this.statistics = true
- },
- submitBG() {
- 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,
- type: this.form.type
- }
- // id: route.query.id
- comfirmDoneStandard({
- createUnqualifiedDTOList,
- createWorkorderRecordDTO
- }).then(res => {
- if (res.code === 200) {
- uni.$u.toast('鎶ュ伐鎴愬姛')
- setTimeout(() => {
- uni.navigateBack({
- data: 2
- })
- }, 2000)
- }
- })
- },
- 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) {
- this.finished = true
- this.pages.page = 1
- this.pageDJs()
- }
- })
- },
- 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 += Number(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
- },
- jumpTL() {
- uni.navigateTo({
- // url: ''
- url: `/pages_adjust/pages/manualFeed/manualFeed?id=${this.workorderId}`
- })
- },
- deleItem(id, type) {
- uni.showModal({
- title: '鎻愮ず',
- content: '纭畾鍒犻櫎姝ゆ潯璁板綍鍚楋紵',
- success: (res) => {
- if (res.confirm) {
- deleteCT(id)
- .then(res => {
- this.getOrocessRecords()
- // if (type === 'C') {
- // this.getOrocessRecordCC()
- // } else if (type === 'T') {
- // this.getOrocessRecords()
- // }
- })
- .catch(err => {})
- }
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .bg_cate {
- width: 100%;
- height: 88rpx;
- background: #FFFFFF;
- display: flex;
- align-items: center;
-
- .active {
- box-sizing: border-box;
- color: #305ED5 !important;
- font-weight: 500;
- border-bottom: 3rpx solid #305ED5;
- }
-
- .bg_cate_item {
- flex: 1;
- height: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 30rpx;
- font-weight: 400;
- color: #555555;
- }
- }
-
- .bg_list {
- width: 100%;
- display: flex;
- flex-direction: column;
- // margin-top: 30rpx;
-
- .bg_list_item {
- display: flex;
- flex-direction: column;
- // margin-bottom: 40rpx;
- // border-bottom: 40rpx #f7f7f7 solid;
- //
- .kong {
- text-align: center;
- padding: 30rpx 0;
- background: #ffffff;
- font-size: 25rpx;
-
- span {
- color: #474747;
- }
- }
-
- .bg_list_item_top {
- display: flex;
- align-items: center;
- justify-content: space-between;
- background-color: #f7f7f7;
- padding: 30rpx;
- // padding-right: 30rpx;
-
- .bg_list_item_top_left {
- display: flex;
- align-items: center;
-
- .left {
- margin-left: 12rpx;
- font-size: 28rpx;
- }
-
- .warning {
- width: 8rpx;
- height: 30rpx;
- border-radius: 2rpx;
- margin-right: 12rpx;
- // background: $nav-stateColor5 !important;
- }
-
- .error {
- width: 8rpx;
- height: 30rpx;
- border-radius: 2rpx;
- margin-right: 12rpx;
- // background: $nav-stateColor4 !important;
- }
-
- .bg_list_item_top_left_x {
- width: 8rpx;
- height: 30rpx;
- // background: $nav-color;
- border-radius: 2rpx;
- margin-right: 12rpx;
- }
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
- display: flex;
- align-items: center;
- }
- }
-
- .bg_list_item_top_right {
- display: flex;
- align-items: center;
-
- image {
- width: 28rpx;
- height: 28rpx;
- margin-right: 12rpx;
- }
-
- span {
- font-size: 28rpx;
- font-weight: 400;
- }
- }
- }
-
- .bg_list_item_h {
- width: 100%;
- padding: 0 30rpx;
- box-sizing: border-box;
- background: white;
- &:last-child {
- .bg_list_item_num{
- border: none !important;
- }
- }
- .bg_list_item_num {
- width: 100%;
- min-height: 98rpx;
- background: white;
- display: flex;
- justify-content: center;
- align-items: center;
- border-bottom: 1rpx solid #E5E5E5;
- .kong {
- text-align: center;
- font-size: 25rpx;
- padding: 30rpx 0;
- background: #ffffff;
- }
- .bg_list_item_num_item {
- width: 100%;
- height: 100%;
- display: flex;
- align-items: center;
- // height: 118rpx;
- padding: 15rpx 0;
- box-sizing: border-box;
- justify-content: space-between;
-
-
- .bg_list_item_num_item_list {
- display: flex;
- align-items: center;
-
- .active {
- background: #305ED5 !important;
- color: #FFFFFF !important;
- }
-
- .bg_list_item_num_item_list_item {
- width: 116rpx;
- height: 62rpx;
- line-height: 62rpx;
- text-align: center;
- background: #F2F2F2;
- border-radius: 8rpx;
- font-size: 26rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #333333;
- margin-right: 20rpx;
-
- &:last-child {
- margin: 0 !important;
- }
- }
- }
-
- .bg_list_item_num_item_wl {
- flex-shrink: 0;
- display: flex;
- flex-direction: column;
- font-size: 34rpx;
- color: #222222;
-
- .bg_list_item_num_item_wl_lx {
- margin-top: 10rpx;
- color: #222222;
- font-size: 28rpx;
- }
- }
-
- // .warning {
- // color: $nav-stateColor5 !important;
- // }
-
- // .err {
- // color: $nav-stateColor4 !important;
- // }
-
- img {
- width: 12rpx;
- height: 24rpx;
- margin-left: 20rpx;
- }
-
- span {
- flex-shrink: 0;
- // overflow: hidden;
- // text-overflow: ellipsis;
- // white-space: nowrap;
-
- b {
- font-size: 30rpx;
- color: red;
- margin-right: 5rpx;
- }
-
- // .warning {
- // color: $nav-stateColor5 !important;
- // margin-right: 5rpx;
- // }
-
- // .err {
- // color: $nav-stateColor4 !important;
- // margin-right: 5rpx;
- // }
-
- &:nth-child(1) {
- font-size: 30rpx;
- font-weight: 400;
- color: #222222;
- }
-
- &:nth-child(2) {
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
- flex-shrink: 0;
- }
- }
-
- .bg_list_item_num_item_sr {
- flex: 1;
- display: flex;
- align-items: center;
- justify-content: flex-end;
-
- .color1 {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #333333;
- }
-
- input::-webkit-input-placeholder {
- font-size: 28rpx;
- }
-
- input {
- text-align: right;
- width: 180rpx;
- height: 60rpx;
- border-radius: 8rpx;
- border: 1rpx solid #E5E5E5;
- margin-right: 20rpx;
- font-size: 28rpx;
- font-weight: 400;
- color: #333333;
- padding: 0 30rpx
- }
-
- .wulll {
- width: 400rpx;
- text-align: right;
- // overflow: hidden;
- // white-space: nowrap;
- // text-overflow: ellipsis;
- }
-
- span {
- font-size: 28rpx;
- font-weight: 400;
- color: #999999;
- }
- }
- }
- }
- }
- }
- }
-
- .bg_plan {
- width: 100%;
- border-top: 20rpx #f7f7f7 solid;
- // height: 98px;
- padding: 30rpx;
- box-sizing: border-box;
- background: #FFFFFF;
- // margin-bottom: 40rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- span {
- font-size: 30rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #222222;
-
- b {
- color: red;
- }
- }
-
- .bg_plan_nr {
- display: flex;
- flex-direction: column;
-
- span {
- font-size: 24rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #666666;
- margin-top: 20rpx;
-
- &:first-child {
- font-size: 32rpx;
- font-family: PingFangSC-Medium, PingFang SC;
- font-weight: 500;
- color: #333333;
- margin-top: 0 !important;
- }
- }
- }
-
- .bg_plan_label_val {
- display: flex;
- align-items: center;
-
- span {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- }
-
-
- }
- }
-
- .img_ar {
- width: 12rpx;
- height: 24rpx;
- margin-left: 20rpx;
- }
-
- .bh_zw {
- height: 160rpx;
- }
-
- .bg_footer {
- position: fixed;
- bottom: 0;
- left: 0;
- width: 100%;
- padding: 30rpx 30rpx 60rpx 30rpx;
- box-sizing: border-box;
- z-index: 9999;
-
- .bg_footer_submit1 {
- width: 690rpx;
- height: 76rpx;
- background: #FFFFFF;
- border-radius: 36rpx;
- border: 1rpx solid #E5E5E5;
- display: flex;
- align-items: center;
- justify-content: center;
-
- .fornt-img {
- width: 28rpx;
- height: 28rpx;
- margin-right: 12rpx;
- }
-
- span {
- font-size: 26rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #305ED5;
- }
- }
-
- .bg_footer_submit {
- width: 690rpx;
- height: 88rpx;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- font-size: 30rpx;
- font-weight: 500;
- color: #FFFFFF;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
-
- .details_dj {
- display: flex;
- flex-direction: column;
-
- .details_dj_list {
- width: 100%;
- box-sizing: border-box;
- background: #ffffff;
- display: flex;
- flex-direction: column;
-
- .details_dj_list_item {
- display: flex;
- flex-direction: column;
- border-bottom: 1rpx solid #E5E5E5;
- padding: 30rpx;
- line-height: 42rpx;
-
- span {
- &:nth-child(1) {
- font-size: 28rpx;
- font-weight: 400;
- color: #222222;
- }
-
- &:nth-child(2) {
- font-size: 24rpx;
- font-weight: 400;
- color: #999999;
- }
- }
- }
- }
-
- .details_dj_title {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding: 0 30rpx 30rpx;
- box-sizing: border-box;
-
- .details_dj_title_left {
- display: flex;
- align-items: center;
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
- }
- }
-
- }
- }
-
- .contanir {
- height: calc(env(safe-area-inset-bottom) + 720rpx);
-
- .content {
- margin-top: 20rpx;
-
- .type-style {
- width: 325rpx;
- margin-bottom: 20rpx;
- }
- }
- }
-
- .bottom-view {
- left: 40rpx;
- right: 40rpx;
- bottom: 20rpx
- }
-
- .bl_list {
- width: 100%;
- height: calc(100% - 168rpx);
- overflow-y: scroll;
- margin-top: 30rpx;
-
- .bl_list_item {
- width: 100%;
- height: 96rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rPX solid #E5E5E5;
-
- &:last-child {
- border: none !important;
- }
-
- .bl_list_item_left {
- flex: 1;
- display: flex;
- align-items: center;
-
- input {
- width: 30rpx;
- height: 30rpx;
- border: 1rpX solid #CCCCCC;
- margin: 0 !important;
- }
-
- span {
- font-size: 30rpx;
- color: #222222;
- margin-left: 10rpx;
- }
- }
-
- .bl_list_item_right {
- flex: 1;
- height: 50rpx;
- text-align: right;
- display: flex;
- justify-content: flex-end;
- input {
- padding-left: 5rpx;
- width: 160rpx;
- height: 100%;
- padding: 0 30rpx;
- box-sizing: border-box;
- text-align: right;
- font-size: 28rpx;
- color: #333333;
- border-radius: 10rpx;
- border: 1rPX solid #CCCCCC;
-
- &::-webkit-input-placeholder {
- font-size: 28rpx;
- font-family: PingFangSC-Regular, PingFang SC;
- font-weight: 400;
- color: #999999;
- }
- }
- }
- }
- }
-
- .tg {
- width: 100%;
- height: 800rpx;
- padding: 30rpx;
- box-sizing: border-box;
-
- .tg_header {
- width: 100%;
- height: 45rpx;
- text-align: center;
- line-height: 45rpx;
- font-size: 30rpx;
- font-weight: 500;
- color: #222222;
- }
-
- .tg_table {
- width: 100%;
- margin-top: 40rpx;
-
- .tg_table_header {
- width: 100%;
- height: 72rpx;
- background: #EFF2FC;
- display: flex;
- align-items: center;
-
- .tg_table_header_item {
- flex: 1;
- font-size: 26rpx;
- font-weight: 500;
- color: #333333;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- }
-
- .nr {
- width: 100%;
- max-height: calc(100% - 133rpx);
- overflow-x: scroll;
-
- .tg_table_nr {
- width: 100%;
- padding: 24rpx 10rpx;
- box-sizing: border-box;
- display: flex;
- align-items: center;
- background: white;
- box-shadow: inset 0px -2rpx 0px 0px #E5E5E5;
-
- .tg_table_nr_item {
- flex: 1;
- font-size: 26rpx;
- font-weight: 500;
- color: #333333;
- display: flex;
- align-items: center;
- justify-content: center;
- }
-
- .tg_table_nr_item1 {
- flex: 1;
- font-size: 26rpx;
- font-weight: 500;
- color: #333333;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
- }
- }
-
- .tg_footer {
- width: calc(100% - 60rpx);
- position: fixed;
- bottom: 0;
- display: flex;
- justify-content: space-between;
- align-items: center;
- box-sizing: border-box;
- padding-bottom: 40rpx;
-
- .tg_footer_fh {
- width: 100%;
- height: 88rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- background: rgba(66, 117, 252, 0.05);
- border-radius: 8rpx;
- border: 1rPX solid #4275FC;
- font-size: 32rpx;
- font-weight: 500;
- color: $nav-color;
- }
-
- .tg_footer_qr {
- width: 100%;
- height: 88rpx;
- border: none;
- display: flex;
- align-items: center;
- justify-content: center;
- background: $nav-color;
- border-radius: 8rpx;
- font-size: 32rpx;
- font-weight: 500;
- color: #FFFFFF;
- }
- }
- .content {
- // height: 100vh;
- background-color: #f7f7f7;
- }
-</style>
diff --git a/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue b/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
deleted file mode 100644
index 11c4c17..0000000
--- a/minipro_standard/pages_inspect/pages/InOperation/InOperation.vue
+++ /dev/null
@@ -1,961 +0,0 @@
-<template>
- <view>
- <InOutInfo :info="info" :isOut="false" />
-
- <uni-collapse @change="change" @close="close" @open="open">
- <uni-collapse-item v-if="type==7" v-for="(item1, index) in wtransferWarehouseList" :key="index"
- :open="item1.wtransferDetailList.length">
- <view class="p30 cY" style="border-bottom: 4rpx solid #f7f7f7;" slot="title">
- <image src="../../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
- <view>{{ item1.warehouseName }}</view>
- </view>
- <view class="p30">
- <div class="page_dck">
- <div class="page_dck_title">
- <div class="page_dck_title_x"></div>
- <span>寰呭叆搴撶墿鏂�</span>
- </div>
- </div>
- <div class="page_content" v-for="(item, index) in item1.wtransferDetailList" v-if="item.outActnum" :key="index"
- :name="index">
- <div class="page_content_title">
- <div class="page_content_title_top">
- <span v-if="item.batch">{{ item.materialName + ' | ' + item.materialCode }}</span>
- <span v-else>{{ item.materialName + ' | ' + item.materialCode }}</span>
- <span>{{item.outActnum}}{{item.unitName}}</span>
- </div>
- <div class="page_content_title_bottom">
- <span class="green" v-if="item.qualityType === 0">鍚堟牸<text class="c6" decode>{{ split}}</text></span>
- <span class="warning" v-else-if="item.qualityType === 1">涓嶈壇<text class="c6" decode>{{ split}}</text></span>
- <span class="error" v-else-if="item.qualityType === 2">鎶ュ簾<text class="c6" decode>{{ split}}</text></span>
- <span v-else>-<text class="c6" decode>{{ split}}</text></span>
- <span>{{item.procedureName ? item.procedureName : '-'}}<text class="c6" decode>{{ split}}</text></span>
- <span>{{item.batch ? item.batch : '-'}}</span>
- </div>
- </div>
- <!-- <div class="page_content_list" v-for="(childer, idxs) in item.wstockExtListVOList" :key="idxs">
- <div class="page_content_list_item">
- <div class="page_content_list_item_label">鍏ュ簱璐т綅锛�</div>
- <div class="page_content_list_item_nr">{{ childer.locationName }}</div>
- </div>
- <div class="page_content_list_items">
- <div class="page_content_list_item_label">鏁伴噺锛�</div>
- <div class="page_content_list_item_nr">{{ childer.num }}{{ childer.unitName }}</div>
- </div>
- </div> -->
- </div>
- </view>
- </uni-collapse-item>
- </uni-collapse>
- <div class="page_h"></div>
- <div class="page_yxwl">
- <div class="page_yxwl_title">
- <div class="left">
- <div class="page_yxwl_title_x"></div>
- <span>宸查�夋嫨鐗╂枡</span>
- </div>
-
- <div class="right" v-if="isZKD" @click="openxz">
- <image src="../../../static/gongdan_ic_shoudong@2x.png" class="img36" mode=""></image><span>鎵嬪姩鍏ュ簱</span>
- <!-- <img src="@/assets/icon/gongdan_ic_shoudong@2x.png" alt=""> -->
- </div>
- </div>
- <!-- 鍏ュ簱鍗曪紙鍗曚釜浠撳簱锛� -->
- <template v-if="type == 9 && woScanMaterialBeanList && woScanMaterialBeanList.length > 0">
- <div class="page_yxwl_list">
- <div class="page_yxwl_list_item" v-for="(item, index) in woScanMaterialBeanList" :key="index">
- <div class="page_yxwl_list_item_top">
- <div class="page_yxwl_list_item_top_left">{{item.materialName}} | {{item.materialCode}}
- </div>
- </div>
- <div class="page_yxwl_list_item_sx">
- <span class="green" v-if="item.qualityType === 0">鍚堟牸<text class="c6" decode>{{ split}}</text></span>
- <span class="warning" v-else-if="item.qualityType === 1">涓嶈壇<text class="c6" decode>{{ split}}</text></span>
- <span class="red" v-else-if="item.qualityType === 2">鎶ュ簾<text class="c6" decode>{{ split}}</text></span>
- <span>{{item.procedureName ? item.procedureName : '-'}}<text class="c6" decode>{{ split}}</text></span>
- <span>{{item.batch ? item.batch : '-'}}</span>
- </div>
- <div class="page_yxwl_list_item_num">
- <div class="dis">
- <div class="item">
- <div class="label">鍏ュ簱璐т綅锛�</div>
- <div class="nr">
- <span>{{item.locationName ? item.locationName : '-'}}</span>
- </div>
- </div>
- <div class="items f24">
- <div class="label">鏁伴噺锛�</div>
- <div class="nr">
- <input type="text" v-model="item.scanNum" placeholder="璇疯緭鍏�" />
- <span>{{item.unitName}}</span>
- </div>
- </div>
- </div>
- <div class="itemy" v-for="(item1, idx) in item.woutboundRedisCodeBeanList" :key="idx">
- <div class="label">宸ヨ{{item1.scanCode}}锛�</div>
- <div class="nr">{{item1.num}}{{item1.unitName}}</div>
- <div class="dele" @click="woScanMaterialBeanList.splice(index, 1)">
- <image src="../../../static/chuku_ic_delete@2x.png" class="img48" mode=""></image>
- </div>
- </div>
- </div>
- </div>
- </div>
- </template>
- <!-- 杞簱鍗曪紙澶氫釜浠撳簱锛� -->
- <template v-else-if="type == 7 && seleMateriaList.length > 0">
- <!-- <template v-for="(item, index) in info.wtransferWarehouseList" :key="index"> -->
- <div class="page_yxwl_list">
- <div class="page_yxwl_list_item" v-for="(item1, idx) in seleMateriaList" :key="idx">
- <div class="page_yxwl_list_item_top">
- <div class="page_yxwl_list_item_top_left">{{item1.materialName}} | {{item1.materialCode}}
- </div>
- </div>
- <div class="page_yxwl_list_item_sx">
- <span class="green" v-if="item1.qualityType === 0">鍚堟牸<text class="c6" decode>{{ split}}</text></span>
- <span class="yellow" v-else-if="item1.qualityType === 1">涓嶈壇<text class="c6" decode>{{ split}}</text></span>
- <span class="red" v-else-if="item1.qualityType === 2">鎶ュ簾<text class="c6" decode>{{ split}}</text></span>
- <span>{{item1.procedureName ? item1.procedureName : '-'}}<text class="c6" decode>{{ split}}</text></span>
- <span>{{item1.batch ? item1.batch : '-'}}</span>
- </div>
- <div class="page_yxwl_list_item_num">
- <div class="itemy">
- <div class="itemy_item">
- <div class="label">鍏ュ簱璐т綅锛�</div>
- <div class="nr">
- <span>{{item1.locationName}}</span>
- </div>
- </div>
- <div class="itemy_item f24">
- <div class="label">鏁伴噺锛�</div>
- <div class="nr">
- <!-- @input="inputNum(item1)" -->
- <input type="number" v-model="item1.outActnum" placeholder="璇疯緭鍏�" />
- <span>{{item1.unitName}}</span>
- </div>
- </div>
- <!-- @click="dele()" dele(index) {
- this.outboundList.splice(index, 1)
- }, -->
- <div class="dele" @click="seleMateriaList.splice(index, 1)">
- <image src="../../../static/chuku_ic_delete@2x.png" class="img48" mode=""></image>
- </div>
- </div>
- </div>
- </div>
- </div>
- <!-- </template> -->
- </template>
- <div class="page_yxwl_kong" v-else>鏆傛棤鏁版嵁</div>
- </div>
- <div class="page_zw"></div>
- <!-- 鎻愪氦鎸夐挳 -->
- <div class="page_footer">
- <div class="page_footer_ck" @click="submit">
- <span>纭鍏ュ簱</span>
- </div>
- </div>
- <SelectLoaction ref="selectLoaction" @selected="selectLocation" />
- <MaterialIn ref="materialIn" @selected="selectMaterial" />
- </view>
-</template>
-
-<script>
- import InOutInfo from '@/components/InOutInfo.vue'
- import SelectLoaction from '@/components/SelectLoaction.vue'
- import MaterialIn from '@/components/materialIn.vue'
- import {
- QRCodeType
- } from '@/common/config.js'
- import {
- getList,
- outScanAppliances,
- getLocationInfo,
- saveIn,
- getInByWTransferId,
- wTransferForInOut,
- wOutBoundForInOut,
- wOutBoundForUpload,
- transferToInNew
- } from '@/util/api/ExWarehouse'
- import {
- wTransferForInOutUpload
- } from '@/util/api/ExWarehouse'
- import {
- getBarcodeContent,
- getListByCondition,
- getListByWarehouseId
- } from '@/util/api/WorkOrderAPI'
- import {
- getDB
- } from '@/util/api/agencyAPI'
- export default {
- components: {
- InOutInfo,
- SelectLoaction,
- MaterialIn
- },
- data() {
- return {
- split: ' / ',
- type: '',
- id: '',
- wareHouseId: '',
- isZKD: false,
- show: false,
- info: {},
- ids: [],
- mainOrder: '',
- location: '',
- locationName: '',
- wtransferWarehouseList: [],
- MateriaList: [],
- woScanMaterialBeanList: [],
- seleMateriaList: [] // 宸查�夌墿鏂�
- };
- },
- onLoad(option) {
- this.type = option.type
- this.id = option.id
- this.isZKD = this.type == QRCodeType.ZKD
- if (option.dbid) {
- this.getDBs(option.dbid)
- } else {
- this.getInfo()
- }
- },
- methods: {
- getDBs(dbid) {
- getDB(dbid)
- .then(res => {
- let {
- data
- } = res
- if (data.status == 1) {
- // 宸插畬鎴�
- } else {
- this.getInfo()
- }
- })
- .catch(err => {})
- },
- getInfo() {
- let infoAction
- let data = {
- id: this.id
- }
- // console.log(this.type, QRCodeType.CKD);
- if (this.type == QRCodeType.RKD) {
- infoAction = wOutBoundForInOut
- data.wOutboundType = '1'
- } else if (this.type == QRCodeType.ZKD) {
- infoAction = wTransferForInOut
- data.wTransferType = '1'
- }
- infoAction(data).then(res => {
- this.mainOrder = res.data.id
- if (this.isZKD) {
- this.info = res.data.wtransfer
- this.wareHouseId = res.data.wtransfer.inWarehouseId
- this.wtransferWarehouseList = res.data.wtransferWarehouseList
- this.MateriaList = res.data.wtransferWarehouseList[0].wtransferDetailList
- } else {
- this.info = res.data.woutbound
- this.woutboundDetailsWait = res.data.woutboundDetailsWait
- this.woScanMaterialBeanList = res.data.woScanMaterialBeanList
- }
- }).catch(err => {
- uni.$u.toast(err)
- uni.navigateBack()
- })
- },
- change() {},
- close() {},
- open() {},
- openxz() {
- getListByWarehouseId({
- wareHouseId: this.wareHouseId
- })
- .then(res => {
- if (res.data.length === 1) {
- this.location = res.data[0].id
- this.locationName = res.data[0].unionName
- this.$refs.materialIn.open({
- list: this.MateriaList
- })
- } else {
- this.$refs.selectLoaction.open({
- wareHouseId: this.wareHouseId
- })
- }
- })
- },
- selectLocation(item) {
- this.location = item.id
- this.locationName = item.unionName
- this.$refs.materialIn.open({
- list: this.MateriaList
- })
- },
- selectMaterial(val) {
- let material = JSON.parse(JSON.stringify(val))
- let repetition = false
- this.seleMateriaList.forEach(item => {
- if (item.locationId == this.location) {
- if (item.id == material.id) {
- repetition = true
- return
- }
- }
- })
- if (repetition) {
- uni.$u.toast('鐩稿悓璐т綅锛屽悓涓�涓墿鏂欏彧鑳芥湁涓�涓�')
- return
- }
- // let tempMaterial = this.seleMateriaList.find(item => item.locationId == this.location)
- // debugger
- // if (tempMaterial) {
- // /*
- // tempMaterial.qualityType == material.qualityType
- // && tempMaterial.procedureId == material.procedureId
- // &&tempMaterial.batch == material.batch
- // &&tempMaterial.oldLocationId == material.locationId
- // && tempMaterial.materialId == material.materialId
- // */
- // if (tempMaterial.id == material.id) {
- // uni.$u.toast('鐩稿悓璐т綅锛屽悓涓�涓墿鏂欏彧鑳芥湁涓�涓�')
- // return
- // }
- // }
- // if (tempMaterial && tempMaterial.id == material.id) {
- // uni.$u.toast('鐩稿悓璐т綅锛屽悓涓�涓墿鏂欏彧鑳芥湁涓�涓�')
- // return
- // }
- let materialNum = 0
- let num = 0
- // let selectedM = this.seleMateriaList.find(item => item.id == material.id)
- // let waitMaterial = this.MateriaList.find(item => item.id === material.id)
- this.seleMateriaList.forEach(item => {
- if (item.id === material.id) {
- materialNum += Number(item.outActnum)
- }
- })
- this.MateriaList.forEach(item => {
- if (item.id === material.id) {
- num = item.outActnum - materialNum
- }
- })
-
- material.outActnum = num
- this.seleMateriaList.push({
- ...material,
- oldLocationId: material.locationId,
- locationId: this.location,
- locationName: this.locationName
- })
- },
- submit() {
- if (this.type == QRCodeType.ZKD) {
- if (!this.seleMateriaList.length) {
- uni.$u.toast('杞叆鐗╂枡涓嶈兘涓虹┖')
- return
- }
- let result = this.seleMateriaList.reduce((a, b) => {
- if (a[b.id]) {
- a[b.id].push(b);
- } else {
- a[b.id] = [b];
- }
- return a;
- }, {});
- for (let i = 0; i < this.MateriaList.length; i++) {
- for (let a in result) {
- if (this.MateriaList[i].id == a) {
- let total = 0
- for (let b = 0; b < result[a].length; b++) {
- total = Number(total) + Number(result[a][b].outActnum)
- }
- if (!total || total <= 0) {
- uni.$u.toast('鍏ュ簱鏁伴噺涓嶈兘灏忎簬0')
- return
- // Toast.fail({
- // message: '鍏ュ簱鏁伴噺涓嶈兘灏忎簬0',
- // forbidClick: true,
- // duration: 2000
- // })
- }
- if (total > this.MateriaList[i].outActnum) {
- uni.$u.toast('鍏ュ簱鏁伴噺涓嶈兘澶т簬寰呭叆搴撴暟閲�')
- return
- // Toast.fail({
- // message: '鍏ュ簱鏁伴噺涓嶈兘澶т簬寰呭叆搴撴暟閲�',
- // forbidClick: true,
- // duration: 2000
- // })
- }
- }
- }
- }
- let submitTransferInDetailDTOList = []
- this.seleMateriaList.forEach(item => {
- submitTransferInDetailDTOList.push({
- inNum: item.outActnum,
- locationId: item.locationId,
- wtransferDetailId: item.id
- })
- })
- transferToInNew({
- submitTransferInDetailDTOList,
- wtransferId: this.id
- }).then(res => {
- if (res.code === 200) {
- this.$store.dispatch('getUpcomingNum')
- uni.$emit('success')
- uni.$u.toast('鎿嶄綔鎴愬姛')
- if (this.type == '4') { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
- // uni.navigateTo({
- // url:
- // })
- // router.push({
- // name: 'completionDetails',
- // query: {
- // id: route.query.id,
- // dbid: route.query.dbid,
- // type: 7,
- // isShow: 2
- // }
- // })
- return
- }
- uni.redirectTo({
- url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${this.id}`
- // pages_adjust/pages/warehousingDetails/warehousingDetails
- })
- // setTimeout(() => {
- // if (route.query.Type == '4') { // 璺宠浆瀹屽伐鍏ュ簱璇︽儏
- // router.push({
- // name: 'completionDetails',
- // query: {
- // id: route.query.id,
- // dbid: route.query.dbid,
- // type: 7,
- // isShow: 2
- // }
- // })
- // return
- // }
- // router.replace({
- // name: 'wTransferDetail',
- // query: {
- // id: route.query.id
- // }
- // })
- // }, 2000)
- }
- })
-
- } else if (this.type === QRCodeType.RKD) {
- wOutBoundForUpload({
- id: this.info.id,
- wOutboundType: 1
- }).then(res => {
- if (res.code === 200) {
- this.$store.dispatch('getUpcomingNum')
- uni.$u.toast('鎿嶄綔鎴愬姛')
- uni.$emit('success')
- uni.redirectTo({
- url: `/pages_adjust/pages/warehousingDetails1/warehousingDetails1?id=${this.id}`
- })
- // Toast.success({
- // message: '鎿嶄綔鎴愬姛',
- // forbidClick: true,
- // duration: 2000
- // })
- // setTimeout(() => {
- // // router.go(-1)
- // router.replace({
- // name: 'wInboundDetail',
- // query: {
- // id: this.id
- // }
- // })
- // }, 2000)
- }
- })
- }
- }
- }
- }
-</script>
-
-<style lang="scss">
- .page_dck {
- .page_dck_title {
- display: flex;
- align-items: center;
-
- .page_dck_title_x {
- width: 8rpx;
- height: 30rpx;
- background: #4275FC;
- border-radius: 2rpx;
- margin-right: 16rpx;
- }
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
- }
- }
- }
-
- .page_content {
- margin-top: 36rpx;
-
- .page_content_title {
- display: flex;
- flex-direction: column;
- margin-bottom: 10rpx;
-
- .page_content_title_top {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- span {
- &:nth-child(1) {
- font-size: 30rpx;
- font-weight: 500;
- color: #222222;
- }
-
- &:nth-child(2) {
- flex-shrink: 0;
- font-size: 24rpx;
- font-weight: 400;
- color: #333333;
-
- span {
- font-size: 24rpx;
- color: $nav-color;
- }
- }
- }
- }
-
- .page_content_title_bottom {
- .green {
- color: $nav-stateColor7 !important;
-
- .black {
- color: black !important;
- }
- }
-
- .warning {
- color: $nav-stateColor5 !important;
-
- .black {
- color: black !important;
- }
- }
-
- .error {
- color: $nav-stateColor4 !important;
-
- .black {
- color: black !important;
- }
- }
-
- span {
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- }
- }
- }
-
- .lineBorder {
- border: none !important;
- padding-bottom: 0 !important;
- margin-bottom: 24rpx;
- }
-
- .page_content_list {
- width: 100%;
- display: flex;
- align-items: center;
- flex-wrap: wrap;
-
- &:first-child {
- margin: 0;
- }
-
- &:last-child {
- border: none;
- }
-
- .page_content_list_nums {
- width: 30%;
- display: flex;
-
- .page_content_list_num_label {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- }
-
- .page_content_list_num_nr {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
-
- .page_content_list_num {
- width: 70%;
- display: flex;
-
- .page_content_list_num_label {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- }
-
- .page_content_list_num_nr {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
-
- .page_content_list_items {
- width: 30%;
- display: flex;
- margin-top: 24rpx;
-
- .page_content_list_item_label {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .page_content_list_item_nr {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
-
- .page_content_list_item {
- width: 70%;
- display: flex;
-
- .page_content_list_item_label {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .page_content_list_item_nr {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- }
- }
-
- .page_h {
- height: 20rpx;
- }
-
- .page_yxwl {
- padding: 30rpx;
- background: #ffffff;
-
- .page_yxwl_title {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- .page_yxwl_title_x {
- width: 8rpx;
- height: 30rpx;
- background: #4275FC;
- border-radius: 2rpx;
- margin-right: 16rpx;
- }
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
- }
-
- .left {
- display: flex;
- align-items: center;
-
- .page_yxwl_title_x {
- width: 8rpx;
- height: 30rpx;
- background: #4275FC;
- border-radius: 2rpx;
- margin-right: 16rpx;
- }
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
- }
- }
-
- .right {
- display: flex;
- align-items: center;
-
- img {
- width: 28rpx;
- height: 28rpx;
- margin-right: 14rpx;
- }
-
- span {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- }
-
- .page_yxwl_list {
- display: flex;
- flex-direction: column;
- padding-bottom: 30rpx;
- border-bottom: 1rpx solid #ececec;
-
- &:last-child {
- margin-bottom: 0;
- border: none;
- }
-
- .page_yxwl_list_item {
- margin-top: 28rpx;
-
- .page_yxwl_list_item_top {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- .page_yxwl_list_item_top_left {
- font-size: 30rpx;
- font-weight: 500;
- color: #222222;
- }
- }
-
- .page_yxwl_list_item_sx {
- display: flex;
- align-items: center;
- margin-top: 15rpx;
- font-size: 24rpx;
- }
-
- .page_yxwl_list_item_num {
- display: flex;
- flex-direction: column;
-
- // margin-top: 30rpx;
- &:first-child {
- margin-top: 0;
- }
-
- .dis {
- display: flex;
- }
-
- .itemy {
- margin-top: 20rpx;
- width: 100%;
- display: flex;
- align-items: center;
- position: relative;
-
- .itemy_item {
- flex: 1;
- display: flex;
- align-items: center;
-
- .label {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .nr {
- display: flex;
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
-
- input {
- width: 100rpx;
- height: 35rpx;
- border-radius: 8rpx;
- border: 1rpx solid #E5E5E5;
- margin-right: 10rpx;
- margin-left: 5rpx;
- }
-
- span {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- }
-
- .dele {
- position: absolute;
- right: -30rpx;
- width: 48rpx;
- height: 48rpx;
-
- img {
- width: 100%;
- height: 100%;
- }
- }
- }
-
- .items {
- width: 50%;
- display: flex;
- align-items: center;
-
- .label {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .nr {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
-
- input {
- width: 100rpx;
- height: 40rpx;
- margin-right: 10rpx;
- }
-
- span {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- }
-
- .item {
- width: 70%;
- display: flex;
- align-items: center;
-
- .label {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .nr {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
-
- input {
- width: 100rpx;
- height: 40rpx;
- margin-right: 10rpx;
- }
-
- span {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- }
- }
- }
- }
-
- .page_yxwl_kong {
- padding: 50rpx 0;
- font-size: 25rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
-
- .page_zw {
- height: 160rpx;
- }
-
- .page_footer {
- width: calc(100% - 60rpx);
- background: #F7F7F7;
- display: flex;
- align-items: center;
- justify-content: space-between;
- position: fixed;
- bottom: 0;
- left: 30rpx;
- padding-bottom: 68rpx;
-
- .page_footer_qr {
- flex: 1;
- height: 88rpx;
- background: #fff;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- font-size: 32rpx;
- font-weight: 500;
- color: $nav-color;
- display: flex;
- align-items: center;
- justify-content: center;
-
- img {
- width: 30rpx;
- height: 30rpx;
- margin-right: 12rpx;
- }
- }
-
- .page_footer_ck {
- flex: 1;
- height: 88rpx;
- background: $nav-color;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- font-size: 32rpx;
- font-weight: 500;
- color: #FFFFFF;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
-</style>
diff --git a/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue b/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
deleted file mode 100644
index 800eef4..0000000
--- a/minipro_standard/pages_inspect/pages/OutOperation/OutOperation.vue
+++ /dev/null
@@ -1,828 +0,0 @@
-<template>
- <page-meta :page-style="ban ?'overflow: hidden;': ''"/>
- <view>
- <InOutInfo :info="info" />
- <uni-collapse @change="change" @close="close" @open="open">
- <uni-collapse-item :open="item1.wtransferDetailList.length" v-if="type==7"
- v-for="(item1, index) in warehouseList" :key="index">
- <view class="p30 cY" style="border-bottom: 4rpx solid #f7f7f7;" slot="title">
- <image src="../../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
- <view>{{ item1.warehouseName }}</view>
- </view>
- <view class="p30">
- <div class="page_dck">
- <div class="page_dck_title">
- <div class="page_dck_title_x"></div>
- <span>寰呭嚭搴撶墿鏂�</span>
- </div>
- </div>
- <div class="page_content" v-for="(item, index) in item1.wtransferDetailList" :key="index"
- :name="index">
- <div class="page_content_title">
- <div class="page_content_title_top">
- <span>{{ item.materialName + ' | ' + item.materialCode }}</span>
- <span>寰呭嚭<span>{{ item.outPlannum }}</span> {{ item.unitName }}</span>
- </div>
- <div class="page_content_title_bottom">
- <span class="green" v-if="item.qualityType === 0">鍚堟牸<text class="c6" decode>{{ split}}</text></span>
- <span class="warning" v-else-if="item.qualityType === 1">涓嶈壇<text class="c6" decode>{{ split}}</text></span>
- <span class="error" v-else-if="item.qualityType === 2">鎶ュ簾<text class="c6" decode>{{ split}}</text></span>
- <span v-else>-<text class="c6" decode>{{ split}}</text></span>
- <span>{{item.procedureName || '-'}}<text class="c6" decode>{{ split}}</text></span>
- <span>{{item.batch ? item.batch : '-'}}</span>
- </div>
- </div>
- <div class="page_content_list" v-for="(childer, idxs) in item.wstockExtListVOList" :key="idxs">
- <div class="page_content_list_item">
- <div class="page_content_list_item_label">鍑哄簱璐т綅锛�</div>
- <div class="page_content_list_item_nr">{{ childer.locationName }}</div>
- </div>
- <div class="page_content_list_items">
- <div class="page_content_list_item_label">鏁伴噺锛�</div>
- <div class="page_content_list_item_nr">{{ childer.num }}{{ childer.unitName }}</div>
- </div>
- <div class="page_content_list_item">
- <div class="page_content_list_item_label">鎵规鍙凤細</div>
- <div class="page_content_list_item_nr">{{ childer.batch ? childer.batch : '-' }}</div>
- </div>
- </div>
- </div>
- </view>
- </uni-collapse-item>
- <uni-collapse-item v-if="type==8">
- <view class="p30 cY" style="border-bottom: 4rpx solid #f7f7f7;" slot="title">
- <image src="../../../static/chuku_ic_cangku@2x.png" class="img36 mr10" mode=""></image>
- <view>{{ info.warehouseName }}</view>
- </view>
- <view class="p30">
- <div class="page_dck">
- <div class="page_dck_title">
- <div class="page_dck_title_x"></div>
- <span>寰呭嚭搴撶墿鏂�</span>
- </div>
- </div>
- <div class="page_content" v-for="(item, index) in woutboundDetailsWait" :key="index" :name="index">
- <div class="page_content_title">
- <div class="page_content_title_top">
- <span>{{ item.materialName + ' | ' + item.materialCode }}</span>
- <span>寰呭嚭 <span>{{ item.num }}</span> {{ item.unitName }}</span>
- </div>
- <div class="page_content_title_bottom">
- <span class="green" v-if="item.qualityType === 0">鍚堟牸<text class="c6" decode>{{ split}}</text></span>
- <span class="warning" v-else-if="item.qualityType === 1">涓嶈壇<text class="c6" decode>{{ split}}</text></span>
- <span class="error" v-else-if="item.qualityType === 2">鎶ュ簾<text class="c6" decode>{{ split}}</text></span>
- <span v-else>-<text class="c6" decode>{{ split}}</text></span>
- <span>{{item.procedureName ? item.procedureName : '-'}}<text class="c6" decode>{{ split}}</text></span>
- <span>{{item.batch ? item.batch : '-'}}</span>
- </div>
- </div>
- <div class="page_content_list" v-for="(items, ind) in item.wstockExtListVOList" :key="ind">
- <div class="page_content_list_item">
- <div class="page_content_list_item_label">鎵规鍙凤細</div>
- <div class="page_content_list_item_nr">{{ items.batch ? items.batch : '-' }}</div>
- </div>
- <div class="page_content_list_items">
- <div class="page_content_list_item_label">鏁伴噺锛�</div>
- <div class="page_content_list_item_nr">{{ items.num }}{{ items.umodel.name }}</div>
- </div>
- <div class="page_content_list_item" v-if="items.lmodel">
- <div class="page_content_list_item_label">鍑哄簱璐т綅锛�</div>
- <div class="page_content_list_item_nr">{{ items.lmodel.unionName }}</div>
- </div>
- </div>
- </div>
- </view>
- </uni-collapse-item>
- </uni-collapse>
-
- <div class="page_h"></div>
- <div class="page_yxwl">
- <div class="page_yxwl_title">
- <div class="left">
- <div class="page_yxwl_title_x"></div>
- <span>宸查�夋嫨鐗╂枡</span>
- </div>
-
- <div class="right" v-if="isZKD" @click="openxz">
- <image src="../../../static/gongdan_ic_shoudong@2x.png" class="img36" mode=""></image>
- <span>鎵嬪姩鍑哄簱</span>
- </div>
- </div>
- <div class="page_yxwl_list" v-if="outboundList.length > 0">
- <div class="page_yxwl_list_item" v-for="(item, index) in outboundList" :key="index">
- <div class="page_yxwl_list_item_top">
- <div class="page_yxwl_list_item_top_left">{{ item.materialName }} | {{ item.materialCode }}
- </div>
-
- </div>
- <div class="page_yxwl_list_item_sx">
- <span class="green" v-if="item.qualityType == 0">鍚堟牸<text class="c6" decode>{{ split}}</text></span>
- <span class="yellow" v-else-if="item.qualityType == 1">涓嶈壇<text class="c6" decode>{{ split}}</text></span>
- <span class="red" v-else-if="item.qualityType == 2">鎶ュ簾<text class="c6" decode>{{ split}}</text></span>
- <span v-else>-<text class="c6" decode>{{ split}}</text></span>
- <span>{{ item.procedureName ? item.procedureName : '-' }}<text class="c6" decode>{{ split}}</text></span>
- <span>{{ item.batch ? item.batch : '-' }}</span>
- </div>
- <div class="page_yxwl_list_item_num">
- <div class="item">
- <div class="label">鍑哄簱璐т綅锛�</div>
- <div class="nr">
- <span>{{ item.locationName }}</span>
- </div>
- </div>
- <div class="item f24">
- <div class="label">鏁伴噺锛�</div>
- <div class="nr">
- <!-- @input="changeNum(item)" -->
- <input type="number" v-model="item.num" placeholder="璇疯緭鍏�">
- <span>{{ item.unitName }}</span>
- </div>
- </div>
- <div class="dele" @click="dele(index)">
- <!-- <img src="@/assets/icon/chuku_ic_delete@2x.png" alt="" /> -->
- <image src="../../../static/chuku_ic_delete@2x.png" class="img48" mode=""></image>
- </div>
- </div>
- </div>
- </div>
- <div class="page_yxwl_kong" v-else>鏆傛棤鏁版嵁</div>
- </div>
- <div class="page_zw"></div>
- <!-- 鎻愪氦鎸夐挳 -->
- <div class="page_footer">
- <div class="page_footer_ck" @click="submit">
- <span>纭鍑哄簱</span>
- </div>
- </div>
- <SelectTraMultipleMaterial ref="selectTraMultipleMaterial" @close="ban = false" @selectes="selectMaterail" />
- </view>
-</template>
-
-<script>
- import InOutInfo from '@/components/InOutInfo.vue'
- import SelectTraMultipleMaterial from '@/components/SelectTraMultipleMaterial.vue'
- import {
- QRCodeType
- } from '@/common/config.js'
- import {
- outScanAppliances,
- wTransferForInOut,
- wTransferForInOutUpload,
- wOutBoundForInOut,
- wOutBoundForUpload,
- transferToOutNew
- } from '@/util/api/ExWarehouse'
- import {
- getDB
- } from '@/util/api/agencyAPI'
- export default {
- components: {
- InOutInfo,
- SelectTraMultipleMaterial
- },
- data() {
-
- return {
- ban: false,
- type: '',
- id: '',
- dbid: '',
- isZKD: false,
- show: false,
- info: {
-
- },
- split: ' / ',
- mainOrder: '',
- warehouseId: '',
- ids: [],
- warehouseList: [{
-
- }],
- woutboundDetailsWait: [],
- outboundList: []
- };
- },
- onLoad(option) {
- this.type = option.type
- this.id = option.id
- this.isZKD = this.type == QRCodeType.ZKD
- this.dbid = option.dbid
- if (option.dbid) {
- this.getDBs(option.dbid)
- } else {
- this.getInfo()
- }
- },
- methods: {
- // 鍒ゆ柇鏄惁瀹屾垚
- getDBs(dbid) {
- getDB(dbid)
- .then(res => {
- let {
- data
- } = res
- if (data.status == 1) {
- // 宸插畬鎴�
- } else {
- this.getInfo()
- }
- })
- .catch(err => {})
- },
- getInfo() {
- let infoAction
- let data = {
- id: this.id
- }
- if (this.type == QRCodeType.CKD) {
- infoAction = wOutBoundForInOut
- data.wOutboundType = '0'
- } else if (this.type == QRCodeType.ZKD) {
- infoAction = wTransferForInOut
- data.wTransferType = '0'
- }
- infoAction(data).then(res => {
- this.mainOrder = res.data.id
- if (this.isZKD) {
- this.info = res.data.wtransfer
- this.warehouseList = res.data.wtransferWarehouseList
- this.warehouseId = this.warehouseList[0].warehouseId
- } else {
- this.info = res.data.woutbound
- this.woutboundDetailsWait = res.data.woutboundDetailsWait
- this.warehouseId = this.woutboundDetailsWait[0].warehouseId
- }
- }).catch(err => {
- uni.$u.toast(err)
- uni.navigateBack()
- })
- },
- change() {},
- close() {},
- open() {},
- openxz() {
- this.ban = true
- this.$refs.selectTraMultipleMaterial.open({
- transferId: this.id,
- warehouseId: this.warehouseId
- })
- },
- selectMaterail(v) {
- this.ban = false
- let tempList = this.warehouseList[0].wtransferDetailList
- let materials = JSON.parse(JSON.stringify(v.materials))
- tempList.forEach(item => {
- let isOutList = false
- this.outboundList.forEach(selected => {
- if (selected.newId == item.id) {
- isOutList = true
- return
- }
- })
- if (!isOutList) {
- item.wstockExtListVOList.forEach(hw => {
- materials.forEach((materail, index) => {
- if (hw.materialId == materail.materialId &&
- hw.procedureId == materail.procedureId &&
- hw.qualityType == materail.qualityType &&
- hw.locationId == materail.locationId &&
- hw.batch == materail.batch
- ) {
- this.addToOutList(materail, item)
- materials.splice(index, 1)
- return
- }
- })
- })
-
-
- // if (item.batch) {
- // // 绮剧‘鍖归厤
- // if (materail.materialId == item.materialId &&
- // materail.procedureId == item.procedureId &&
- // materail.qualityType == item.qualityType &&
- // materail.batch == item.batch
- // ) {
- // this.addToOutList(materail, item)
- // materials.splice(index, 1)
- // return
- // }
- // } else {
- // if (materail.materialId == item.materialId &&
- // materail.procedureId == item.procedureId &&
- // materail.qualityType == item.qualityType
- // ) {
- // this.addToOutList(materail, item)
- // materials.splice(index, 1)
- // return
- // }
- // }
-
- }
- })
- },
- addToOutList(materail, item) {
- let isExist = false
- this.outboundList.forEach(selected => {
- if (selected.newId == materail.id) {
- isExist = true
- return
- }
- })
- if (isExist) {
- uni.$u.toast('璇ョ墿鏂欏凡瀛樺湪')
- } else {
- let obj = JSON.parse(JSON.stringify(materail))
- obj.newId = item.id
- this.outboundList.push(obj)
- console.log(this.outboundList);
- }
- },
- dele(index) {
- this.outboundList.splice(index, 1)
- },
- submit() {
- if (this.type == QRCodeType.ZKD) {
- if (this.outboundList.length > 0) {
- let result = this.outboundList.reduce((a, b) => {
- if (a[b.newId]) {
- a[b.newId].push(b);
- } else {
- a[b.newId] = [b];
- }
- return a;
- }, {});
- let tempList = this.warehouseList[0].wtransferDetailList
- for (let i = 0; i < tempList.length; i++) {
- let item = tempList[i]
- for (let a in result) {
- if (item.id == a) {
- let total = 0
- for (let b = 0; b < result[a].length; b++) {
- total = Number(total) + Number(result[a][b].num)
- }
- if (!total || total <= 0) {
- uni.$u.toast('鍑哄簱鐗╂枡鏁伴噺蹇呴』澶т簬0')
- return
- }
- console.log(total, item.outPlannum);
- if (total > item.outPlannum) {
- uni.$u.toast('鍑哄簱鏁伴噺涓嶈兘澶т簬寰呭嚭搴撴暟閲�')
- return
- }
- }
- }
- }
- let submitTransferOutDetailDTOList = []
- this.outboundList.forEach(item => {
- tempList.forEach(child => {
- if (item.newId == child.id) {
- submitTransferOutDetailDTOList.push({
- outNum: item.num,
- wstockId: item.id,
- wtransferDetailId: child.id
- })
- }
- })
- })
- transferToOutNew({
- submitTransferOutDetailDTOList,
- wtransferId: this.id
- }).then(res => {
- if (res.code === 200) {
- this.$store.dispatch('getUpcomingNum')
- uni.$u.toast('鎿嶄綔鎴愬姛')
- uni.$emit('success')
- uni.redirectTo({
- url: `/pages_adjust/pages/warehousingDetails/warehousingDetails?id=${this.id}&dbid=${this.dbid}`
- })
- // setTimeout(() => {
- // router.replace({ name: 'wTransferDetail', query: { id: info.value.wtransfer.id, dbid: route.query.dbid } })
- // }, 2000)
- }
- })
- } else {
- uni.$u.toast('璇烽�夋嫨鍑哄簱鐗╂枡')
- }
- } else if (this.type === QRCodeType.CKD) {
- wOutBoundForUpload({
- id: this.id,
- wOutboundType: 0
- }).then(res => {
- if (res.code === 200) {
- this.$store.dispatch('getUpcomingNum')
- uni.$u.toast('鎿嶄綔鎴愬姛')
- uni.$emit('success')
- uni.redirectTo({
- url: `/pages_adjust/pages/outboundDetails/outboundDetails?id=${this.id}`
- })
- // setTimeout(() => {
- // // router.go(-1)
- // router.replace({ name: 'wOutboundDetail', query: { id: info.value.wtransfer.id } })
- // }, 2000)
- }
- })
- }
- }
- }
- }
-</script>
-
-<style lang="scss">
- .page_dck {
- .page_dck_title {
- display: flex;
- align-items: center;
-
- .page_dck_title_x {
- width: 8rpx;
- height: 30rpx;
- background: #4275FC;
- border-radius: 2rpx;
- margin-right: 16rpx;
- }
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
- }
- }
- }
-
- .page_content {
- margin-top: 36rpx;
-
- .page_content_title {
- display: flex;
- flex-direction: column;
- margin-bottom: 10rpx;
-
- .page_content_title_top {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- span {
- &:nth-child(1) {
- font-size: 30rpx;
- font-weight: 500;
- color: #222222;
- }
-
- &:nth-child(2) {
- flex-shrink: 0;
- font-size: 24rpx;
- font-weight: 400;
- color: #333333;
-
- span {
- font-size: 24rpx;
- color: $nav-color;
- }
- }
- }
- }
-
- .page_content_title_bottom {
- .green {
- color: $nav-stateColor7 !important;
-
- .black {
- color: black !important;
- }
- }
-
- .warning {
- color: $nav-stateColor5 !important;
-
- .black {
- color: black !important;
- }
- }
-
- .error {
- color: $nav-stateColor4 !important;
-
- .black {
- color: black !important;
- }
- }
-
- span {
- font-size: 24rpx;
- font-weight: 400;
- color: #666666;
- }
- }
- }
-
- .lineBorder {
- border: none !important;
- padding-bottom: 0 !important;
- margin-bottom: 24rpx;
- }
-
- .page_content_list {
- width: 100%;
- display: flex;
- align-items: center;
- flex-wrap: wrap;
-
- &:first-child {
- margin: 0;
- }
-
- &:last-child {
- border: none;
- }
-
- .page_content_list_nums {
- width: 30%;
- display: flex;
-
- .page_content_list_num_label {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- }
-
- .page_content_list_num_nr {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
-
- .page_content_list_num {
- width: 70%;
- display: flex;
-
- .page_content_list_num_label {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- }
-
- .page_content_list_num_nr {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
-
- .page_content_list_items {
- width: 30%;
- display: flex;
- margin-top: 24rpx;
-
- .page_content_list_item_label {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .page_content_list_item_nr {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
-
- .page_content_list_item {
- width: 70%;
- display: flex;
-
- .page_content_list_item_label {
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .page_content_list_item_nr {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- }
- }
-
- .page_h {
- height: 20rpx;
- }
-
- .page_yxwl {
- padding: 30rpx;
- background: #ffffff;
-
- .page_yxwl_title {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- .page_yxwl_title_x {
- width: 8rpx;
- height: 30rpx;
- background: #4275FC;
- border-radius: 2rpx;
- margin-right: 16rpx;
- }
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
- }
-
- .left {
- display: flex;
- align-items: center;
-
- .page_yxwl_title_x {
- width: 8rpx;
- height: 30rpx;
- background: #4275FC;
- border-radius: 2rpx;
- margin-right: 16rpx;
- }
-
- span {
- font-size: 32rpx;
- font-weight: 500;
- color: #222222;
- }
- }
-
- .right {
- display: flex;
- align-items: center;
-
- img {
- width: 28rpx;
- height: 28rpx;
- margin-right: 14rpx;
- }
-
- span {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- }
-
- .page_yxwl_list {
- display: flex;
- flex-direction: column;
- padding-bottom: 30rpx;
- border-bottom: 1rpx solid #ececec;
-
- &:last-child {
- margin-bottom: 0;
- border: none;
- }
-
- .page_yxwl_list_item {
- margin-top: 28rpx;
-
- .page_yxwl_list_item_top {
- display: flex;
- align-items: center;
- justify-content: space-between;
-
- .page_yxwl_list_item_top_left {
- font-size: 30rpx;
- font-weight: 500;
- color: #222222;
- }
- }
-
- .page_yxwl_list_item_sx {
- display: flex;
- align-items: center;
- margin-top: 15rpx;
- font-size: 24rpx;
- }
-
- .page_yxwl_list_item_num {
- display: flex;
- position: relative;
- margin-top: 36rpx;
-
- &:first-child {
- margin-top: 0;
- }
-
- .dele {
- position: absolute;
- right: -30rpx;
- width: 48rpx;
- height: 48rpx;
-
- img {
- width: 100%;
- height: 100%;
- }
- }
-
- .item {
- width: 50%;
- display: flex;
- align-items: center;
-
- .label {
- flex-shrink: 0;
- font-size: 26rpx;
- font-weight: 400;
- color: #666666;
- flex-shrink: 0;
- }
-
- .nr {
- flex: 1;
- display: flex;
- align-items: center;
-
- input {
- width: 130rpx;
- height: 40rpx;
- border-radius: 8rpx;
- border: 1rpx solid #E5E5E5;
- margin-right: 10rpx;
- }
-
- span {
- font-size: 26rpx;
- font-weight: 400;
- color: #222222;
- }
- }
- }
- }
- }
- }
-
- .page_yxwl_kong {
- padding: 50rpx 0;
- font-size: 25rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
-
- .page_zw {
- height: 160rpx;
- }
-
- .page_footer {
- width: calc(100% - 60rpx);
- background: #F7F7F7;
- display: flex;
- align-items: center;
- justify-content: space-between;
- position: fixed;
- bottom: 0;
- left: 30rpx;
- padding-bottom: 68rpx;
- z-index: 9999;
-
- .page_footer_qr {
- flex: 1;
- height: 88rpx;
- background: #fff;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- font-size: 32rpx;
- font-weight: 500;
- color: $nav-color;
- display: flex;
- align-items: center;
- justify-content: center;
-
- img {
- width: 30rpx;
- height: 30rpx;
- margin-right: 12rpx;
- }
- }
-
- .page_footer_ck {
- flex: 1;
- height: 88rpx;
- background: $nav-color;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.08);
- border-radius: 8rpx;
- font-size: 32rpx;
- font-weight: 500;
- color: #FFFFFF;
- display: flex;
- align-items: center;
- justify-content: center;
- }
- }
-</style>
diff --git a/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue b/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue
deleted file mode 100644
index fb83d85..0000000
--- a/minipro_standard/pages_inspect/pages/equipmentInspection/equipmentInspection.vue
+++ /dev/null
@@ -1,586 +0,0 @@
-<template>
- <view class="box1">
- <!-- 璁惧+鏃ユ湡 -->
- <view class="box_list">
- <view class="box_list_item" @click="show = true">
- <view class="box_list_item_left">
- <text>妫�楠岃澶�</text><text>*</text>
- </view>
- <view class="box_list_item_right">
- <text :style="form.equipmentName ? 'color: #000' : ''">{{ form.equipmentName ? form.equipmentName : '鐐瑰嚮閫夋嫨宸℃璁惧' }}</text>
- <u-icon name="arrow-right" color="#999999" size="18"></u-icon>
- </view>
- </view>
- <view class="box_list_code" @click.stop="openCode">
- <view class="boxs">
- <image src="@/static/jianyan_ic_saoma@2x.png" alt="" />
- <text>鎵弿璁惧</text>
- </view>
- </view>
- <view class="box_list_item" @click="showTime = true">
- <view class="box_list_item_left">
- <text>宸℃鏃堕棿</text><text>*</text>
- </view>
- <view class="box_list_item_right">
- <text class="black">{{form.time}}</text>
- <u-icon name="arrow-right" color="#999999" size="18"></u-icon>
- </view>
- </view>
- </view>
- <!-- 鐘舵��+鍥剧墖/瑙嗛 -->
- <view class="box_list1">
- <view class="box_list1_item">
- <view class="box_list1_item_left">
- <text>璁惧鐘舵��</text><text>*</text>
- </view>
- <view class="box_list1_item_right">
- <view class="box_list1_item_right_item" :class="{'active': item.active}"
- v-for="(item, index) in status" :key="index" @click="changeItem(index, item.id)">{{item.name}}
- </view>
- </view>
- </view>
- <view class="box_list1_club">
- <view class="box_list1_club_label">宸℃鐜板満鐓х墖<text v-show="form.status == '1'">*</text></view>
- <view class="box_list1_club_list">
- <view class="box_list1_club_list_item" @click="uploadFile">
- <view class="type">
- <image class="type_img" src="@/static/btn_upload@2x.png" alt="" />
- </view>
- </view>
- <view class="box_list1_club_list_item" v-for="(item, index) in form.files" :key="index"
- @click="seeBigFile(index)">
- <image class="close" src="@/static/ic_delete@2x.png" @click.stop="dele(index)" />
- <image class="play" src="@/static/ic_play@2x.png" v-if="item.typec === 1" />
- <view class="type">
- <video :src="item.url" v-if="item.typec === 1"></video>
- <image v-else class="type_img" :src="item.url" mode="widthFix" />
- </view>
- </view>
- <view class="box_list1_club_list_item1"></view>
- <view class="box_list1_club_list_item1"></view>
- </view>
- </view>
- </view>
- <view class="box_list2">
- <view class="box_list2_label">澶囨敞</view>
- <textarea v-model="form.remarks" cols="20" rows="5" maxlength="300" placeholder="璇疯缁嗘弿杩板贰妫�鎯呭喌"></textarea>
- </view>
- <view class="box_footer">
- <button class="box_footer_submit" v-preventReClick @click="submit">鎻愪氦</button>
- </view>
- <!-- 鏌ョ湅澶у浘 -->
- <Preview :list="form.files.map(item => item.url)" :current="current" @close="isOpen = false" v-if="isOpen" />
- <!-- 閫夋嫨璁惧 -->
- <ytyDataPicker :show="show" :dataList="columns" @select="handleSelect" @search="handleSearch" @close="show = false" />
- <!-- 閫夋嫨鏃堕棿 -->
- <u-datetime-picker :show="showTime" v-model="currentDate" @cancel="showTime = false" @confirm="queding" mode="datetime"></u-datetime-picker>
- </view>
-</template>
-
-<script>
- import { getBarcodeContent } from '@/util/api/WorkOrderAPI'
- import { saveBean, getDeviceByCondition, getsbInfo } from '@/util/api/QualityAPI'
- import { queryListByCode, uploadFiles } from '@/util/api/index'
- import { QRCodeType, baseUrl, fileType } from '@/common/config.js'
- import { setTime, judgmentType } from '@/util/utils.js'
- import { mapState } from 'vuex'
- import ytyDataPicker from '@/components/yty-data-picker/yty-data-picker.vue'
- import Preview from '@/components/Preview.vue'
-
- export default {
- data() {
- return {
- status: [{
- name: '姝ｅ父',
- active: true,
- id: '0'
- },
- {
- name: '寮傚父',
- active: false,
- id: '1'
- }
- ],
- columns: [],
- isOpen: false,
- path: '',
- show: false,
- showTime: false,
- currentDate: new Date(),
- current: 0,
- form: {
- equipmentId: '', // 璁惧id
- equipmentName: '', //璁惧鍚嶇О
- time: '', // 宸℃鏃堕棿
- status: '0', // 璁惧鐘舵��
- files: [], // 宸℃鍥剧墖/瑙嗛
- remarks: '' // 澶囨敞
- }
- };
- },
- components:{
- ytyDataPicker,
- Preview
- },
- onLoad() {
- this.form.time = setTime(new Date(), '-')
- this.getqueryListByCode()
- this.getSB('')
- },
- computed: {
- ...mapState(['session'])
- },
- methods: {
- // 鏌ョ湅澶у浘/瑙嗛
- seeBigFile(i) {
- this.current = i
- this.isOpen = true
- },
- // 鍒犻櫎鎸囧畾鏂囦欢
- dele(i) {
- this.form.files.splice(i, 1)
- },
- // 閫夋嫨璁惧
- handleSelect(e) {
- this.form.equipmentId = e.code
- this.form.equipmentName = e.name
- this.show = false
- },
- // 鎼滅储璁惧
- handleSearch(e) {
- this.getSB(e)
- },
- // 纭閫夋嫨鏃ユ湡
- queding(val) {
- this.form.time = uni.$u.timeFormat(val.value, 'yyyy-mm-dd hh:MM:ss')
- this.showTime = false
- },
- // 鎵爜
- openCode() {
- var that = this
- uni.scanCode({
- onlyFromCamera: true,
- success: function (result) {
- getBarcodeContent({
- barcode: result.result
- }).then(res => {
- if (res.code === 200) {
- if (res.data.barcodeType === QRCodeType.SB) {
- getsbInfo(res.data.id)
- .then(res1 => {
- if (res1.code === 200) {
- that.form.equipmentId = res1.data.id
- that.form.equipmentName = res1.data.name
- }
- })
- } else {
- uni.showToast({
- title: '璇锋壂鎻忔纭殑璁惧鐮�',
- icon: 'none',
- duration: 2000
- });
- }
- }
- })
- }
- });
- },
- // 鏀瑰彉鐘舵��
- changeItem(i, id) {
- this.status.forEach((item, index) => {
- item.active = index === i;
- })
- this.form.status = id
- },
- submit() {
- if (!this.form.equipmentId) return uni.showToast({
- title: '璁惧涓嶈兘涓虹┖',
- icon: 'none',
- duration: 2000
- });
- if (!this.form.time) return uni.showToast({
- title: '鏃堕棿涓嶈兘涓虹┖',
- icon: 'none',
- duration: 2000
- });
- if (!this.form.status) return uni.showToast({
- title: '鐘舵�佷笉鑳戒负绌�',
- icon: 'none',
- duration: 2000
- });
- if (this.form.status == '1') {
- if (this.form.files.length === 0) return uni.showToast({
- title: '鐜板満鐓х墖涓嶈兘涓虹┖',
- icon: 'none',
- duration: 2000
- });
- }
- saveBean({
- checkDate: this.form.time,
- content: this.form.remarks,
- deviceId: this.form.equipmentId,
- status: this.form.status,
- multiFilesSaveBeans: this.form.files
- }).then(res => {
- if (res.code === 200) {
- uni.showToast({
- title: '鎻愪氦鎴愬姛',
- icon: 'success',
- duration: 2000,
- mask: true
- });
- setTimeout(() => {
- uni.navigateBack({
- delta: 1
- });
- }, 2000)
- }
- })
- },
- // 鑾峰彇褰撳墠鐢ㄦ埛涓嬫墍鏈夎澶�
- getSB(name) {
- getDeviceByCondition({ name })
- .then(res => {
- if (res.code === 200 && res.data && res.data.length > 0) {
- let arr = []
- res.data.forEach(item => {
- arr.push({ name: item.name, code: item.id })
- })
- this.columns = arr
- } else {
- this.columns = []
- }
- })
- },
- // 鐐瑰嚮涓婁紶
- uploadFile() {
- var that = this
- uni.chooseMedia({
- mediaType: ['image', 'video'],
- sourceType: ['album', 'camera'],
- success: (chooseImageRes) => {
- uni.showLoading({ title: '涓婁紶涓�' });
- const tempFilePaths = chooseImageRes.tempFiles;
- for (let i = 0; i < tempFilePaths.length; i++) {
- uni.uploadFile({
- url: baseUrl + '/ext/routeCardExt/upload',
- filePath: tempFilePaths[i].tempFilePath,
- name: 'file',
- header: {
- 'Cookie': 'eva-auth-token=' + that.session
- },
- formData: {
- 'folder': that.path
- },
- success: (uploadFileRes) => {
- let res = JSON.parse(uploadFileRes.data)
- let typec = ''
- for (let s = 0; s < fileType.length; s++) {
- if (tempFilePaths[i].tempFilePath.indexOf(fileType[s].name) !== -1) {
- typec = fileType[s].type
- }
- }
- that.form.files.push({
- fileUrl: res.data.imgaddr,
- filename: res.data.imgname,
- typec,
- url: res.data.url
- })
- uni.hideLoading();
- }
- });
- }
- }
- });
- },
- // 鑾峰彇瀛楀吀绾�
- getqueryListByCode() {
- queryListByCode({
- dicCode: 'FOLDER',
- label: 'DEVICE_CHECK'
- }).then(res => {
- if (res.code === 200) {
- this.path = res.data[0].code
- }
- })
- }
- }
- }
-</script>
-
-<style lang="scss" scoped>
- .box1 {
- width: 100%;
- height: 100%;
- position: absolute;
- background: #F7F7F7;
-
- .sb {
- width: 100%;
- height: 800rpx;
- padding: 30rpx;
- box-sizing: border-box;
- }
-
- .box_list {
- padding: 0 30rpx 0 30rpx;
- background: white;
- display: flex;
- flex-direction: column;
-
- .box_list_code {
- margin: 20rpx 0;
-
- .boxs {
- display: flex;
- align-items: center;
- justify-content: flex-end;
-
- image {
- width: 28rpx;
- height: 28rpx;
- margin-right: 12rpx;
- }
-
- text {
- font-size: 28rpx;
- font-weight: 400;
- color: $nav-color;
- }
- }
- }
-
- .box_list_item {
- height: 98rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
-
- &:last-child {
- border: none;
- }
-
- .box_list_item_left {
- text {
- font-size: 30rpx;
- font-weight: 400;
-
- &:first-child {
- color: #222222;
- }
-
- &:last-child {
- color: #DE5243;
- margin-left: 8rpx;
- }
- }
- }
-
- .box_list_item_right {
- display: flex;
- align-items: center;
- .black {
- color: black;
- }
-
- text {
- font-size: 28rpx;
- font-weight: 400;
- color: #999999;
- margin-right: 10rpx;
- }
- }
- }
- }
-
- .box_list1 {
- padding: 30rpx;
- background: white;
- margin-top: 20rpx;
-
- .box_list1_item {
- height: 98rpx;
- display: flex;
- align-items: center;
- justify-content: space-between;
- border-bottom: 1rpx solid #E5E5E5;
-
- &:last-child {
- border: none;
- }
-
- .box_list1_item_left {
- text {
- font-size: 30rpx;
- font-weight: 400;
- color: #222222;
-
- &:last-child {
- font-size: 30rpx;
- font-weight: 400;
- color: #DE5243;
- margin-left: 4rpx;
- }
- }
- }
-
- .box_list1_item_right {
- display: flex;
- align-items: center;
-
- .active {
- color: white !important;
- background: $nav-color !important;
- }
-
- .box_list1_item_right_item {
- padding: 18rpx 32rpx;
- background: #F2F2F2;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 26rpx;
- font-weight: 400;
- color: #333333;
- margin-left: 20rpx;
- border-radius: 8rpx;
- }
- }
- }
-
- .box_list1_club {
- display: flex;
- flex-direction: column;
- margin-top: 36rpx;
-
- .box_list1_club_label {
- font-size: 30rpx;
- font-weight: 400;
- color: #222222;
- margin-bottom: 32rpx;
-
- text {
- font-size: 30rpx;
- font-weight: 400;
- color: #DE5243;
- margin-left: 4rpx;
- }
- }
-
- .box_list1_club_list {
- display: flex;
- align-items: center;
- justify-content: space-between;
- flex-wrap: wrap;
-
- .box_list1_club_list_item1 {
- width: 170rpx;
- height: 0;
- }
-
- .box_list1_club_list_item {
- width: 150rpx;
- height: 150rpx;
- border-radius: 8rpx;
- position: relative;
- margin-right: 22rpx;
- margin-bottom: 22rpx;
-
- .type {
- width: 100%;
- height: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- overflow: hidden;
- position: absolute;
- top: 0;
- left: 0;
-
- .type_img {
- width: 100%;
- height: 100%;
- }
-
- video {
- height: 100%;
- z-index: 1;
- }
- }
-
- .play {
- position: absolute;
- left: 50%;
- top: 50%;
- width: 56rpx;
- height: 56rpx;
- z-index: 9;
- transform: translate(-50%, -50%);
- }
-
- .close {
- position: absolute;
- right: -16rpx;
- top: -16rpx;
- width: 32rpx;
- height: 32rpx;
- z-index: 9;
- }
- }
- }
- }
- }
-
- .box_list2 {
- padding: 30rpx;
- background: white;
- margin-top: 20rpx;
- display: flex;
- flex-direction: column;
-
- .box_list2_label {
- font-size: 30rpx;
- font-weight: 400;
- color: #222222;
- margin-bottom: 32rpx;
- }
-
- textarea {
- border: none;
- font-size: 28rpx;
- }
-
- textarea::-webkit-input-placeholder {
- font-size: 28rpx;
- font-weight: 400;
- color: #B2B2B2;
- }
- }
-
- .box_footer {
- width: 100%;
- padding: 0 30rpx 68rpx 30rpx;
- box-sizing: border-box;
- position: fixed;
- bottom: 0;
- left: 0;
- background: #F7F7F7;
-
- .box_footer_submit {
- width: 100%;
- height: 88rpx;
- background: #4275FC;
- box-shadow: 0 0 12rpx 0 rgba(0, 0, 0, 0.0800);
- border-radius: 8rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 30rpx;
- font-weight: 500;
- color: #FFFFFF;
- border: none;
- }
- }
- }
-</style>
\ No newline at end of file
diff --git a/minipro_standard/store/index.js b/minipro_standard/store/index.js
deleted file mode 100644
index dbd69fe..0000000
--- a/minipro_standard/store/index.js
+++ /dev/null
@@ -1,127 +0,0 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-import {
- pageCount,
- getTreeList,
- getUserInfo
-} from '@/util/api/index.js'
-
-Vue.use(Vuex) // vue鐨勬彃浠舵満鍒�
-
-const navHeight = uni.getStorageSync('navHeight');
-const statusbarHeight = uni.getStorageSync('statusbarHeight');
-const menuButtonWidth = uni.getStorageSync('menuButtonWidth');
-const token = uni.getStorageSync('token');
-const userInfo = uni.getStorageSync('userInfo');
-const Menu = uni.getStorageSync('MenuList');
-const session = uni.getStorageSync('session');
-
-
-// Vuex.Store 鏋勯�犲櫒閫夐」
-const store = new Vuex.Store({
- // 涓轰簡涓嶅拰椤甸潰鎴栫粍浠剁殑data涓殑閫犳垚娣锋穯锛宻tate涓殑鍙橀噺鍓嶉潰寤鸿鍔犱笂$绗﹀彿
- state: {
- // 鐢ㄦ埛淇℃伅
- userInfo: userInfo || null,
- token: token || null,
- menuButtonWidth: menuButtonWidth || '0',
- statusbarHeight: statusbarHeight || '0',
- navHeight: navHeight || '0',
- session: session ? session : '',
- // 鑿滃崟鏉冮檺
- Menu: Menu ? JSON.parse(Menu) : [],
- // 寰呭姙鏁伴噺
- upcomingNum: {
- d: 0,
- y: 0
- },
- },
- mutations: {
- setHeight(state, val) {
- state.navHeight = val.navHeight
- state.statusbarHeight = val.statusbarHeight
- state.menuButtonWidth = val.menuButtonWidth
- uni.setStorageSync('navHeight', val.navHeight);
- uni.setStorageSync('statusbarHeight', val.statusbarHeight);
- uni.setStorageSync('menuButtonWidth', val.menuButtonWidth);
- },
- SETTOKEN(state, val) {
- state.token = val
- uni.setStorageSync('token', val);
- },
- SETUSERINFO(state, val) {
- state.userInfo = val
- uni.setStorageSync('userInfo', val);
- },
- SETNUM(state, val) {
- state.upcomingNum.d = val.d
- state.upcomingNum.y = val.y
- },
- SETMENU(state, data) {
- state.Menu = data
- uni.setStorageSync('MenuList', JSON.stringify(data));
- },
- SETSESSION(state, data) {
- state.session = data;
- uni.setStorageSync('session', data);
- },
- clearCache(state) {
- state.userInfo = ''
- state.token = ''
- state.session = ''
- state.Menu = []
- state.upcomingNum.d = 0
- state.upcomingNum.y = 0
- uni.clearStorageSync()
- }
- },
- actions: {
- // 鍚戝悗绔幏鍙栬彍鍗曟爮鏉冮檺
- async getMenuList(content, type) {
- let res = await getTreeList({
- type: type
- })
- if (res && res.code === 200) {
- content.commit('SETMENU', res.data)
- }
- },
- // 鑾峰彇鐘舵�侀珮搴�
- getHeight(context) {
- // #ifdef MP-WEIXIN
- let res = uni.getMenuButtonBoundingClientRect()
- let status = uni.getSystemInfoSync()
- let menuButtonWidth = res.width
- let height = res.height
- let statusbarHeight = status.statusBarHeight
- let navHeight = res.height + (res.top - statusbarHeight) * 2;
- context.commit('setHeight', {
- statusbarHeight,
- navHeight,
- height,
- menuButtonWidth
- })
- // #endif
-
- },
- async getUpcomingNum(context) {
- let res = await pageCount({})
-
- if (res && res.code === 200) {
- context.commit('SETNUM', {
- d: res.data.startNum,
- y: res.data.endNum
- })
- }
- },
- // 鍚戝悗绔幏鍙栦釜浜轰俊鎭�
- async getUserInfos(content) {
- let res = await getUserInfo()
- if (res && res.code === 200) {
- content.commit('SETUSERINFO', res.data)
- return true;
- }
- }
- }
-})
-
-export default store
\ No newline at end of file
diff --git a/minipro_standard/uni.scss b/minipro_standard/uni.scss
deleted file mode 100644
index 28aa226..0000000
--- a/minipro_standard/uni.scss
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * 杩欓噷鏄痷ni-app鍐呯疆鐨勫父鐢ㄦ牱寮忓彉閲�
- *
- * uni-app 瀹樻柟鎵╁睍鎻掍欢鍙婃彃浠跺競鍦猴紙https://ext.dcloud.net.cn锛変笂寰堝涓夋柟鎻掍欢鍧囦娇鐢ㄤ簡杩欎簺鏍峰紡鍙橀噺
- * 濡傛灉浣犳槸鎻掍欢寮�鍙戣�咃紝寤鸿浣犱娇鐢╯css棰勫鐞嗭紝骞跺湪鎻掍欢浠ｇ爜涓洿鎺ヤ娇鐢ㄨ繖浜涘彉閲忥紙鏃犻渶 import 杩欎釜鏂囦欢锛夛紝鏂逛究鐢ㄦ埛閫氳繃鎼Н鏈ㄧ殑鏂瑰紡寮�鍙戞暣浣撻鏍间竴鑷寸殑App
- *
- */
-
-/**
- * 濡傛灉浣犳槸App寮�鍙戣�咃紙鎻掍欢浣跨敤鑰咃級锛屼綘鍙互閫氳繃淇敼杩欎簺鍙橀噺鏉ュ畾鍒惰嚜宸辩殑鎻掍欢涓婚锛屽疄鐜拌嚜瀹氫箟涓婚鍔熻兘
- *
- * 濡傛灉浣犵殑椤圭洰鍚屾牱浣跨敤浜唖css棰勫鐞嗭紝浣犱篃鍙互鐩存帴鍦ㄤ綘鐨� scss 浠ｇ爜涓娇鐢ㄥ涓嬪彉閲忥紝鍚屾椂鏃犻渶 import 杩欎釜鏂囦欢
- */
-
-/* 棰滆壊鍙橀噺 */
-@import '@/uni_modules/uview-ui/theme.scss';
-
-$nav-color: #4275FC;
-
-// 鍏ㄥ眬鐘舵�佽壊
-$nav-stateColor1: #305ED5;
-$nav-stateColor2: #03AF76;
-$nav-stateColor3: #999999;
-$nav-stateColor4: #de5243;
-$nav-stateColor5: #F5A400;
-$nav-stateColor6: #666666;
-$nav-stateColor7: #03AF76;
-
-/* 琛屼负鐩稿叧棰滆壊 */
-$uni-color-primary: #007aff;
-$uni-color-success: #4cd964;
-$uni-color-warning: #f0ad4e;
-$uni-color-error: #dd524d;
-
-/* 鏂囧瓧鍩烘湰棰滆壊 */
-$uni-text-color:#333;//鍩烘湰鑹�
-$uni-text-color-inverse:#fff;//鍙嶈壊
-$uni-text-color-grey:#999;//杈呭姪鐏拌壊锛屽鍔犺浇鏇村鐨勬彁绀轰俊鎭�
-$uni-text-color-placeholder: #808080;
-$uni-text-color-disable:#c0c0c0;
-
-/* 鑳屾櫙棰滆壊 */
-$uni-bg-color:#ffffff;
-$uni-bg-color-grey:#f8f8f8;
-$uni-bg-color-hover:#f1f1f1;//鐐瑰嚮鐘舵�侀鑹�
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//閬僵棰滆壊
-
-/* 杈规棰滆壊 */
-$uni-border-color:#c8c7cc;
-
-/* 灏哄鍙橀噺 */
-
-/* 鏂囧瓧灏哄 */
-$uni-font-size-sm:12px;
-$uni-font-size-base:14px;
-$uni-font-size-lg:16;
-
-/* 鍥剧墖灏哄 */
-$uni-img-size-sm:20px;
-$uni-img-size-base:26px;
-$uni-img-size-lg:40px;
-
-/* Border Radius */
-$uni-border-radius-sm: 2px;
-$uni-border-radius-base: 3px;
-$uni-border-radius-lg: 6px;
-$uni-border-radius-circle: 50%;
-
-/* 姘村钩闂磋窛 */
-$uni-spacing-row-sm: 5px;
-$uni-spacing-row-base: 10px;
-$uni-spacing-row-lg: 15px;
-
-/* 鍨傜洿闂磋窛 */
-$uni-spacing-col-sm: 4px;
-$uni-spacing-col-base: 8px;
-$uni-spacing-col-lg: 12px;
-
-/* 閫忔槑搴� */
-$uni-opacity-disabled: 0.3; // 缁勪欢绂佺敤鎬佺殑閫忔槑搴�
-
-/* 鏂囩珷鍦烘櫙鐩稿叧 */
-$uni-color-title: #2C405A; // 鏂囩珷鏍囬棰滆壊
-$uni-font-size-title:20px;
-$uni-color-subtitle: #555555; // 浜岀骇鏍囬棰滆壊
-$uni-font-size-subtitle:26px;
-$uni-color-paragraph: #3F536E; // 鏂囩珷娈佃惤棰滆壊
-$uni-font-size-paragraph:15px;
-
-.backgreen {
- background: $nav-stateColor2 !important;
-}
-
-.backyellow {
- background: $nav-stateColor5 !important;
-}
-
-.backred {
- background: $nav-stateColor4 !important;
-}
-
-/* #ifdef H5 */
-img {
- width: 100%;
- height: 100%;
-}
-
-view {
- display: block;
-}
-
-image {
- display: block;
-
-}
-/* #endif */
-
diff --git a/minipro_standard/uni_modules/l-calendar/components/l-calendar/l-calendar.vue b/minipro_standard/uni_modules/l-calendar/components/l-calendar/l-calendar.vue
deleted file mode 100644
index f8d23c8..0000000
--- a/minipro_standard/uni_modules/l-calendar/components/l-calendar/l-calendar.vue
+++ /dev/null
@@ -1,832 +0,0 @@
-<template>
- <view @touchmove.stop.prevent>
- <view class="l-calendar-box" :class="{'calendar-box-show': value}">
- <view class="calendar-top">
- <view>{{title}}</view>
- <view class="close l-icons icon-shanchu" hover-class="l-opacity" :hover-stay-time="150" @tap="hide">
- </view>
- </view>
-
- <view class="date-box">
- <view class=" date-arrowleft l-icons icon-youjiantou" :style="{ color: yearChangeColor }"
- hover-class="l-opacity" :hover-stay-time="150" @tap="changeYear(false)">
- </view>
- <view class=" date-arrowleft l-icons icon-zuojiantou" :style="{ color: monthChangeColor }"
- hover-class="l-opacity" :hover-stay-time="150" @tap="changeMonth(false)"></view>
- <view class="title-datetime">{{ showTitle }}</view>
- <view class=" date-arrowright l-icons icon-youjiantou2" :style="{ color: monthChangeColor }"
- hover-class="l-opacity" :hover-stay-time="150" @tap="changeMonth(true)"></view>
- <view class=" date-arrowright l-icons icon-youjiantou1" :style="{ color: yearChangeColor }"
- hover-class="l-opacity" :hover-stay-time="150" @tap="changeYear(true)"></view>
- </view>
- <view class="date-weekday">
- <view class="date-weekday-item">鏃�</view>
- <view class="date-weekday-item">涓�</view>
- <view class="date-weekday-item">浜�</view>
- <view class="date-weekday-item">涓�</view>
- <view class="date-weekday-item">鍥�</view>
- <view class="date-weekday-item">浜�</view>
- <view class="date-weekday-item">鍏�</view>
- </view>
- <view class="date-content" :style="{ height: dateHeight * 6 + 'px' }">
- <block v-for="(item, index) in weekdayArr" :key="index">
- <view class="date-weekday-item"></view>
- </block>
- <view class="date-weekday-item" :class="{
- 'l-opacity': isDisable(year, month, index + 1),
- 'start-date': (isRange && startDate == `${year}-${month}-${index + 1}`) || !isRange,
- 'end-date': (isRange && endDate == `${year}-${month}-${index + 1}`) || !isRange
- }" :style="{ backgroundColor: getColor(index, 1), height: dateHeight + 'px',padding:0}"
- v-for="(item, index) in daysArr" :key="index" @tap="dateClick(index)">
- <view class="date-content-item" :style="{ color: getColor(index, 2) }">
- <view>{{ index + 1 }}</view>
- <!-- 鍐滃巻 -->
- <view class="custom-desc">
- {{ getText(index, startDate, endDate) }}
- </view>
- </view>
- <view class="date-content-item-desc" :style="{ color: activeColor }"
- v-if="!lunar && isRange && startDate == `${year}-${month}-${index + 1}` && startDate != endDate">
- {{ startText }}
- </view>
- <view class="date-content-item-desc" :style="{ color: activeColor }"
- v-if="!lunar && isRange && endDate == `${year}-${month}-${index + 1}`">{{ endText }}</view>
- </view>
- <view class="bg-mounth">{{ month }}</view>
- </view>
-
- <view class="calendar-text">
- <!-- <view class="calendar-result">
- <text>{{ !isRange ? activeDate : startDate }}</text>
- <text v-if="endDate">鑷硔{ endDate }}</text>
- </view> -->
- <view class="calendar-btn">
- <button :style="{opacity:disabled ? '.5' : '1'}" :size="28" :disabled="disabled"
- @click="confireBtnClick(false)">纭畾
- </button>
- </view>
- </view>
- </view>
-
- <view class="mask" :class="[value ? 'mask-show' : '']" @tap="hide"></view>
- </view>
-</template>
-<script>
- import calendar from './calendar.js';
- export default {
- name: 'lCalendar',
- model: {
- prop: 'value',
- event: 'input'
- },
- props: {
- //鍙屽悜缁戝畾鐨勫�� 鐢ㄤ簬灞曠ず/鍏抽棴鏃ュ巻
- value: {
- type: Boolean,
- default: false
- },
- //鏄惁閫夋嫨鑼冨洿 true鏄� false閫夋嫨鍗曚釜鏃ユ湡
- isRange: {
- type: Boolean,
- default: false
- },
- //鍙垏鎹㈡渶澶у勾浠�
- maxYear: {
- type: Number,
- default: 2100
- },
- //鍙垏鎹㈡渶灏忓勾浠�
- minYear: {
- type: Number,
- default: 1920
- },
- //鏈�灏忓彲閫夋棩鏈� 涓嶅湪鑼冨洿鍐呮棩鏈熺閫�
- minDate: {
- type: String,
- default: '1920-01-01'
- },
- //鏈�澶у彲閫夋棩鏈�
- maxDate: {
- type: String,
- default: '2100-1-1'
- },
- //缁勪欢鏍囬
- title: {
- type: String,
- default: '鏃ユ湡閫夋嫨'
- },
- //鏈堜唤鍒囨崲绠ご棰滆壊
- monthChangeColor: {
- type: String,
- default: '#999'
- },
- //骞翠唤鍒囨崲绠ご棰滆壊
- yearChangeColor: {
- type: String,
- default: '#bfbfbf'
- },
- //榛樿鏃ユ湡瀛椾綋棰滆壊
- color: {
- type: String,
- default: '#333'
- },
-
- //閫変腑鏃ユ湡瀛椾綋棰滆壊
- activeColor: {
- type: String,
- default: '#fff'
- },
- //閫変腑鏃ユ湡鑳屾櫙鑹�
- activeBgColor: {
- type: String,
- default: '#55BBF9'
- },
- //鑼冨洿鍐呮棩鏈熻儗鏅壊
- rangeBgColor: {
- type: String,
- default: 'rgba(85, 187, 249, 0.1)'
- },
- //鑼冨洿鍐呮棩鏈熷瓧浣撻鑹�
- rangeColor: {
- type: String,
- default: '#55BBF9'
- },
-
- //鑼冨洿閫夋嫨鏃剁敓鏁� 寮�濮嬫棩鏈熻嚜瀹氫箟鏂囧瓧
- startText: {
- type: String,
- default: '寮�濮�'
- },
- //鑼冨洿閫夋嫨鏃剁敓鏁� 缁撴潫鏃ユ湡鑷畾涔夋枃瀛�
- endText: {
- type: String,
- default: '缁撴潫'
- },
- //鏄惁鏄剧ず鍐滃巻
- lunar: {
- type: Boolean,
- default: true
- },
- //鍒濆鍖栧紑濮嬮�変腑鏃ユ湡 鏍煎紡锛� 2020-06-06 鎴� 2020/06/06
- initStartDate: {
- type: String,
- default: ''
- },
- //鍒濆鍖栫粨鏉熸棩鏈� 鏍煎紡锛� 2020-06-06 鎴� 2020/06/06
- initEndDate: {
- type: String,
- default: ''
- }
- },
- data() {
- return {
- weekday: 1, // 鏄熸湡鍑�,鍊间负1-7
- weekdayArr: [],
- days: 0, //褰撳墠鏈堟湁澶氬皯澶�
- daysArr: [],
- showTitle: '',//褰撳墠骞存湀鏍囬
- year: 2020,
- month: 0,
- day: 0,
- startYear: 0,
- startMonth: 0,
- startDay: 0,
- endYear: 0,
- endMonth: 0,
- endDay: 0,
- today: '', //浠婂ぉ鐨勬棩鏈�
- activeDate: '', //褰撳墠閫変腑鏃ユ湡
- startDate: '', //鑼冨洿閫夋嫨鏃剁殑閫変腑寮�濮嬫棩鏈�
- endDate: '', //鑼冨洿閫夋嫨鏃剁殑閫変腑缁撴潫鏃ユ湡
- isStart: true,
- min: null,
- max: null,
- dateHeight: 20
- };
- },
- computed: {
- dataChange() {
- return `${this.type}-${this.minDate}-${this.maxDate}-${this.initStartDate}-${this.initEndDate}`;
- },
- disabled() {
- return this.isRange && (!this.startDate || !this.endDate)
- }
- },
- watch: {
- dataChange(val) {
- this.init();
- },
- },
- created() {
- this.init();
- },
- methods: {
- getColor(index, type) {
- let color = type == 1 ? '' : this.color;
- let day = index + 1;
- let date = `${this.year}-${this.month}-${day}`;
- let timestamp = new Date(date.replace(/\-/g, '/')).getTime();
- let start = this.startDate.replace(/\-/g, '/');
- let end = this.endDate.replace(/\-/g, '/');
- if ((this.activeDate == date) || this.startDate == date || this.endDate == date) {
- color = type == 1 ? this.activeBgColor : this.activeColor;
- } else if (this.endDate && timestamp > new Date(start).getTime() && timestamp < new Date(end).getTime()) {
- color = type == 1 ? this.rangeBgColor : this.rangeColor;
- }
- return color;
- },
- getText(index, startDate, endDate) {
- let text = this.lunar ? this.getLunar(this.year, this.month, index + 1) : '';
- if (this.isRange) {
- if (this.lunar) {
- let date = `${this.year}-${this.month}-${index + 1}`;
- if (startDate == date && startDate != endDate) {
- text = this.startText;
- } else if (endDate == date) {
- text = this.endText;
- }
- }
- }
- return text;
- },
- getLunar(year, month, day) {
- let obj = calendar.solar2lunar(year, month, day);
- if (obj.IDayCn == '鍒濅竴') {
- return obj.IMonthCn
- }
- return obj.IDayCn;
- },
- init() {
- this.dateHeight = uni.getSystemInfoSync().windowWidth / 7;
- let now = new Date();
- this.year = now.getFullYear();
- this.month = now.getMonth() + 1;
- this.day = now.getDate();
- this.today = `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`;
- this.activeDate = this.today;
- this.min = this.initDate(this.minDate);
- this.max = this.initDate(this.maxDate);
- if (this.isDisable(this.year, this.month, this.day)) {
- this.year = this.min.year;
- this.month = this.min.month;
- this.day = this.min.day;
- this.activeDate = `${this.min.year}-${this.min.month}-${this.min.day}`;
- this.max = this.initDate(this.maxDate || this.minDate);
- }
- this.startDate = '';
- this.startYear = 0;
- this.startMonth = 0;
- this.startDay = 0;
- if (this.initStartDate) {
- let start = new Date(this.initStartDate.replace(/\-/g, '/'));
- if (!this.isRange) {
- this.year = start.getFullYear();
- this.month = start.getMonth() + 1;
- this.day = start.getDate();
- this.activeDate = `${start.getFullYear()}-${start.getMonth() + 1}-${start.getDate()}`;
- } else {
- this.startDate = `${start.getFullYear()}-${start.getMonth() + 1}-${start.getDate()}`;
- this.startYear = start.getFullYear();
- this.startMonth = start.getMonth() + 1;
- this.startDay = start.getDate();
- this.activeDate = '';
- }
-
- }
- this.endYear = 0;
- this.endMonth = 0;
- this.endDay = 0;
- this.endDate = '';
- if (this.initEndDate && this.isRange) {
- let end = new Date(this.initEndDate.replace(/\-/g, '/'));
- this.endDate = `${end.getFullYear()}-${end.getMonth() + 1}-${end.getDate()}`;
- this.endYear = end.getFullYear();
- this.endMonth = end.getMonth() + 1;
- this.endDay = end.getDate();
- this.activeDate = '';
- this.year = end.getFullYear();
- this.month = end.getMonth() + 1;
- this.day = end.getDate();
- }
- this.isStart = true;
- this.changeData();
- },
- //鏃ユ湡澶勭悊
- initDate(date) {
- let dateArr = date.split('-');
- return {
- year: Number(dateArr[0] || 1920),
- month: Number(dateArr[1] || 1),
- day: Number(dateArr[2] || 1)
- };
- },
- isDisable(year, month, day) {
- let bool = true;
- let date = `${year}/${month}/${day}`;
- let min = `${this.min.year}/${this.min.month}/${this.min.day}`;
- let max = `${this.max.year}/${this.max.month}/${this.max.day}`;
- let timestamp = new Date(date).getTime();
- if (timestamp >= new Date(min).getTime() && timestamp <= new Date(max).getTime()) {
- bool = false;
- }
- return bool;
- },
- generateArray(start, end) {
- return Array.from(new Array(end + 1).keys()).slice(start);
- },
- formatNum(num) {
- return num < 10 ? '0' + num : num + '';
- },
- //涓�涓湀鏈夊灏戝ぉ
- getMonthDay(year, month) {
- let days = new Date(year, month, 0).getDate();
- return days;
- },
- // 鑾峰彇褰撳墠鏃ユ湡鏄槦鏈熷嚑
- getWeekday(year, month) {
- let date = new Date(`${year}/${month}/01 00:00:00`);
- return date.getDay();
- },
- changeMonth(isAdd) {
- if (isAdd) {
- let month = this.month + 1;
- let year = month > 12 ? this.year + 1 : this.year;
- if (year > this.minYear || year < this.maxYear) {
- this.month = month > 12 ? 1 : month;
- this.year = year;
- this.changeData();
- }
- } else {
- let month = this.month - 1;
- let year = month < 1 ? this.year - 1 : this.year;
- if (year > this.minYear || year < this.maxYear) {
- this.month = month < 1 ? 12 : month;
- this.year = year;
- this.changeData();
- }
- }
- },
- changeYear(isAdd) {
- let year = isAdd ? this.year + 1 : this.year - 1;
- if (year > this.minYear || year < this.maxYear) {
- this.year = year;
- this.changeData();
- }
- },
- changeData() {
- this.days = this.getMonthDay(this.year, this.month);
- this.daysArr = this.generateArray(1, this.days);
- this.weekday = this.getWeekday(this.year, this.month);
- this.weekdayArr = this.generateArray(1, this.weekday);
- this.showTitle = `${this.year}骞�${this.month}鏈坄;
- if (!this.isRange) {
- this.confireBtnClick(true);
- }
- },
- dateClick: function(day) {
- day += 1;
- if (!this.isDisable(this.year, this.month, day)) {
- this.day = day;
- let date = `${this.year}-${this.month}-${day}`;
- if (!this.isRange) {
- this.activeDate = date;
- } else {
- let compare = new Date(date.replace(/\-/g, '/')).getTime() < new Date(this.startDate.replace(
- /\-/g, '/')).getTime();
- if (this.isStart || compare) {
- this.startDate = date;
- this.startYear = this.year;
- this.startMonth = this.month;
- this.startDay = this.day;
- this.endYear = 0;
- this.endMonth = 0;
- this.endDay = 0;
- this.endDate = '';
- this.activeDate = '';
- this.isStart = false;
- } else {
- this.endDate = date;
- this.endYear = this.year;
- this.endMonth = this.month;
- this.endDay = this.day;
- this.isStart = true;
- }
- }
- }
- },
- hide() {
- this.$emit('input', false)
- },
- getWeekText(date) {
- date = new Date(`${date.replace(/\-/g, '/')} 00:00:00`);
- let week = date.getDay();
- return '鏄熸湡' + ['鏃�', '涓�', '浜�', '涓�', '鍥�', '浜�', '鍏�'][week];
- },
- confireBtnClick(show) {
- if (!show) {
- this.hide();
- }
- if (!this.isRange) {
- let arr = this.activeDate.split('-');
- let year = +arr[0];
- let month = +arr[1];
- let day = +arr[2];
- //褰撳墠鏈堟湁澶氬皯澶�
- let days = this.getMonthDay(year, month);
- let result = `${year}-${this.formatNum(month)}-${this.formatNum(day)}`;
- let weekText = this.getWeekText(result);
- let isToday = false;
- if (`${year}-${month}-${day}` == this.today) {
- //浠婂ぉ
- isToday = true;
- }
- let lunar = calendar.solar2lunar(year, month, day);
- this.$emit('change', {
- year: year,
- month: month,
- day: day,
- days: days,
- result: result,
- week: weekText,
- isToday: isToday,
- lunar: lunar
- });
- } else {
- if (!this.startDate || !this.endDate) return;
- let startMonth = this.formatNum(this.startMonth);
- let startDay = this.formatNum(this.startDay);
- let startDate = `${this.startYear}-${startMonth}-${startDay}`;
- let startWeek = this.getWeekText(startDate);
- let startLunar = calendar.solar2lunar(this.startYear, startMonth, startDay);
-
- let endMonth = this.formatNum(this.endMonth);
- let endDay = this.formatNum(this.endDay);
- let endDate = `${this.endYear}-${endMonth}-${endDay}`;
- let endWeek = this.getWeekText(endDate);
- let endLunar = calendar.solar2lunar(this.endYear, endMonth, endDay);
- this.$emit('change', {
- startYear: this.startYear,
- startMonth: this.startMonth,
- startDay: this.startDay,
- startDate: startDate,
- startWeek: startWeek,
- startLunar: startLunar,
- endYear: this.endYear,
- endMonth: this.endMonth,
- endDay: this.endDay,
- endDate: endDate,
- endWeek: endWeek,
- endLunar: endLunar
- });
- }
- }
- }
- };
-</script>
-
-<style lang="scss" scoped>
- @font-face {
- font-family: 'l-icons';
- src: url('data:font/ttf;charset=utf-8;base64,AAEAAAANAIAAAwBQRkZUTZa9XzsAAAjcAAAAHEdERUYAKQAOAAAIvAAAAB5PUy8yPDVJwwAAAVgAAABgY21hcMxRtw0AAAHUAAABYmdhc3D//wADAAAItAAAAAhnbHlm05h+ZAAAA0wAAAJ8aGVhZCQifFoAAADcAAAANmhoZWEHyAOSAAABFAAAACRobXR4EnYBLQAAAbgAAAAcbG9jYQKkAegAAAM4AAAAEm1heHABFgBMAAABOAAAACBuYW1lXoIBAgAABcgAAAKCcG9zdMeZtAYAAAhMAAAAaAABAAAAAQAA+jMzTF8PPPUACwQAAAAAAOCMnBkAAAAA4IycGQAA/6sD6gOAAAAACAACAAAAAAAAAAEAAAOA/4AAXAQLAAAAAAPqAAEAAAAAAAAAAAAAAAAAAAAGAAEAAAAIAEAABAAAAAAAAgAAAAoACgAAAP8AAAAAAAAABAQEAZAABQAAAokCzAAAAI8CiQLMAAAB6wAyAQgAAAIABQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUGZFZADA5gDm8AOA/4AAAAPcAIAAAAABAAAAAAAAAAAAAAAgAAEEAAAAAAAAAAFVAAAECwAWBAsAHgQAAPkBCwAAAAAAAwAAAAMAAAAcAAEAAAAAAFwAAwABAAAAHAAEAEAAAAAMAAgAAgAE5gDmB+Yf5iPm8P//AADmAOYH5h/mI+bw//8aAxn9GeYZ4xkXAAEAAAAAAAAAAAAAAAAAAAEGAAABAAAAAAAAAAECAAAAAgAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAByAOAA9AEIAT4AAAAEABb/wQPiA0sAIQAkAD4APwAAAQYUFwEWHwE3Njc2JyYnJicBJwE2NzY3NicmJzEuAQYHCQE3ByU+ATc2JwEnNwE2Jy4BDwEGBw4BFwEWHwE3MQHuFhYBcRIZDAwvDQQDAwsFBf7IBQE3DgUJAgICAQQLLDET/o8BqAwM/kUbJwEBGf7HBgYBOhwGB1MiabFZFwEXAXESGAoJAbkWQxf+kBIEAgIKLQ8TDw4HBAE5BAE3DQgNDRINBQkYGAcT/o/+CAICAQIqGyIZATkEBQE6HCUsHh5psVgXRBf+kBIEAgEAAAAEAB7/tQPqAz8AIAAiADwAPQAAATY0JwEmLwEHBgcGFxYXFhcBFwEGBwYHBhcWFzEeATY3AwclDgEHBhcBFwcBBhceAT8BNjc+AScBJi8BBzECEhYW/o8SGQwMLw0EAwMLBQUBOAX+yQ4FCQICAgEECywxEzcMAccbJwEBGQE5Bgb+xhwGB1MiabFZFwEX/o8SGAoJAUcWQxcBcBIEAgIKLQ8TDw4HBP7HBP7JDQgNDRINBQkYGAcTA2kCAQIqGyIZ/scEBf7GHCUsHh5psVgXRBcBcBIEAgEAAAAAAQD5/68DSQOAAAUAADcXCQEHAflnAen+F2cBghZnAekB6Gf+fwAAAAEBC/+rAxgDVQAFAAAJARcJAQcBCwG9UP6JAWJRAYEB1Ez+dv52SgABAAD/sAPOA4AAGwAACQEWFAYiJwkBBiImNDcJASY0NjIXCQE2MhYUBwJPAWoVKzwW/pb+lhY8KxUBa/6VFSs8FgFqAWoWPCsVAZj+lRU9KxUBa/6VFSs9FQFrAWsVPSsV/pUBaxUrPRUAAAAAABIA3gABAAAAAAAAABMAKAABAAAAAAABAAgATgABAAAAAAACAAcAZwABAAAAAAADAAgAgQABAAAAAAAEAAgAnAABAAAAAAAFAAsAvQABAAAAAAAGAAgA2wABAAAAAAAKACsBPAABAAAAAAALABMBkAADAAEECQAAACYAAAADAAEECQABABAAPAADAAEECQACAA4AVwADAAEECQADABAAbwADAAEECQAEABAAigADAAEECQAFABYApQADAAEECQAGABAAyQADAAEECQAKAFYA5AADAAEECQALACYBaABDAHIAZQBhAHQAZQBkACAAYgB5ACAAaQBjAG8AbgBmAG8AbgB0AABDcmVhdGVkIGJ5IGljb25mb250AABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABSAGUAZwB1AGwAYQByAABSZWd1bGFyAABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABWAGUAcgBzAGkAbwBuACAAMQAuADAAAFZlcnNpb24gMS4wAABpAGMAbwBuAGYAbwBuAHQAAGljb25mb250AABHAGUAbgBlAHIAYQB0AGUAZAAgAGIAeQAgAHMAdgBnADIAdAB0AGYAIABmAHIAbwBtACAARgBvAG4AdABlAGwAbABvACAAcAByAG8AagBlAGMAdAAuAABHZW5lcmF0ZWQgYnkgc3ZnMnR0ZiBmcm9tIEZvbnRlbGxvIHByb2plY3QuAABoAHQAdABwADoALwAvAGYAbwBuAHQAZQBsAGwAbwAuAGMAbwBtAABodHRwOi8vZm9udGVsbG8uY29tAAAAAAIAAAAAAAAACgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAEAAgECAQMBBAEFAQYKeW91amlhbnRvdQt5b3VqaWFudG91MQt5b3VqaWFudG91Mgp6dW9qaWFudG91B3NoYW5jaHUAAAAB//8AAgABAAAADAAAABYAAAACAAEAAwAHAAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAAOCMnBkAAAAA4IycGQ==') format('truetype');
- font-weight: normal;
- font-style: normal;
- font-display: swap;
- }
-
- .l-icons {
- font-family: 'l-icons';
- font-size: 38rpx;
- color: #333333;
- font-style: normal;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale
- }
-
- .icon-shanchu:before {
- content: "\e6f0";
- }
-
- .icon-youjiantou:before {
- content: "\e600";
- }
-
- .icon-zuojiantou:before {
- content: "\e623";
- }
-
- .icon-youjiantou1:before {
- content: "\e607";
- }
-
- .icon-youjiantou2:before {
- content: "\e61f";
- }
-
- .l-calendar-box {
- width: 100%;
- position: fixed;
- left: 0;
- right: 0;
- bottom: 0;
- z-index: 99999;
- visibility: hidden;
- transform: translate3d(0, 100%, 0);
- transform-origin: center;
- transition: all 0.3s ease-in-out;
- min-height: 20rpx;
-
- .calendar-top {
- width: 100%;
- height: 80rpx;
- padding: 0 40rpx;
- display: flex;
- justify-content: center;
- align-items: center;
- box-sizing: border-box;
- font-size: 30rpx;
- font-weight: bold;
- background-color: #fff;
- color: #333;
- position: relative;
- border-top-left-radius: 20rpx;
- border-top-right-radius: 20rpx;
- overflow: hidden;
- .close {
- position: absolute;
- right: 30rpx;
- top: 50%;
- transform: translateY(-50%);
- color: #999;
-
- }
- }
-
- .date-box {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- padding: 20rpx 0 30rpx;
- background-color: #fff;
- .date-arrowleft {
- margin-right: 32rpx;
- }
-
- .date-arrowright {
- margin-left: 32rpx;
- }
-
- .title-datetime {
- padding: 0 16rpx;
- color: #333;
- font-size: 30rpx;
- line-height: 30rpx;
- font-weight: bold;
- }
- }
-
- .date-weekday {
- width: 100%;
- display: flex;
- align-items: center;
- background-color: #fff;
- font-size: 24rpx;
- line-height: 24rpx;
- color: #555;
- box-shadow: 0 15rpx 20rpx -15rpx #efefef;
- position: relative;
- z-index: 2;
- .date-weekday-item {
- width: 14.2857%;
- display: flex;
- align-items: center;
- justify-content: center;
- padding: 12rpx 0;
- overflow: hidden;
- position: relative;
- z-index: 2;
- }
- }
- .date-content {
- width: 100%;
- display: flex;
- flex-wrap: wrap;
- padding: 12rpx 0;
- box-sizing: border-box;
- background-color: #fff;
- position: relative;
- align-content: flex-start;
- .date-weekday-item {
- width: 14.2857%;
- display: flex;
- align-items: center;
- justify-content: center;
- padding: 12rpx 0;
- overflow: hidden;
- position: relative;
- z-index: 2;
-
- .date-content-item {
- width: 80rpx;
- height: 80rpx;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
- font-size: 32rpx;
- line-height: 32rpx;
- position: relative;
- border-radius: 50%;
- background-color: transparent;
- .custom-desc {
- width: 100%;
- font-size: 24rpx;
- line-height: 24rpx;
- transform: scale(0.8);
- transform-origin: center center;
- text-align: center;
- }
-
- }
- .date-content-item-desc {
- width: 100%;
- font-size: 24rpx;
- line-height: 24rpx;
- position: absolute;
- left: 0;
- transform: scale(0.8);
- transform-origin: center center;
- text-align: center;
- bottom: 8rpx;
- z-index: 2;
- }
- }
- .start-date {
- border-top-left-radius: 8rpx;
- border-bottom-left-radius: 8rpx;
- }
-
- .end-date {
- border-top-right-radius: 8rpx;
- border-bottom-right-radius: 8rpx;
- }
-
- .bg-mounth {
- position: absolute;
- font-size: 260rpx;
- line-height: 260rpx;
- left: 50%;
- top: 50%;
- transform: translate(-50%, -50%);
- color: #f5f5f7;
- z-index: 1;
- }
- }
-
-
- .calendar-text {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- flex-direction: column;
- background-color: #fff;
- padding: 0 42rpx calc(env(safe-area-inset-bottom) + 20rpx);
- box-sizing: border-box;
- font-size: 24rpx;
- color: #666;
- .calendar-result {
- height: 48rpx;
- transform: scale(0.9);
- transform-origin: center 100%;
- }
-
- .calendar-btn {
- width: 100%;
-
- button {
- background-color: #305ED5;
- color: #fff;
- height: 72rpx;
- line-height: 72rpx;
- font-size: 32rpx
- }
- }
- }
-
-
-
- }
- .mask {
- position: fixed;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- background: rgba(0, 0, 0, 0.6);
- z-index: 9996;
- transition: all 0.3s ease-in-out;
- opacity: 0;
- visibility: hidden;
- }
-
- .mask-show {
- opacity: 1;
- visibility: visible;
- }
-
- /* @font-face {
- font-family: 'tuiDateFont';
- src: url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAAVgAA0AAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAFRAAAABoAAAAci0/w50dERUYAAAUkAAAAHgAAAB4AKQANT1MvMgAAAaAAAABDAAAAVjxuSNNjbWFwAAAB+AAAAEoAAAFS5iPQt2dhc3AAAAUcAAAACAAAAAj//wADZ2x5ZgAAAlQAAAFHAAABvPf29TBoZWFkAAABMAAAADAAAAA2GMsN3WhoZWEAAAFgAAAAHQAAACQHjAOFaG10eAAAAeQAAAATAAAAFgzQAPJsb2NhAAACRAAAABAAAAAQAOoBSG1heHAAAAGAAAAAHgAAACABEwA3bmFtZQAAA5wAAAFJAAACiCnmEVVwb3N0AAAE6AAAADQAAABLUwjqHHjaY2BkYGAAYp5Gj5/x/DZfGbhZGEDg1tUn7+F00P/LzOuY9YFcDgYmkCgAa0gNlHjaY2BkYGBu+N/AEMPCAALM6xgYGVABCwBT4AMaAAAAeNpjYGRgYGBn0GZgYgABEMkFhAwM/8F8BgANaAFLAAB42mNgZGFgnMDAysDA1Ml0hoGBoR9CM75mMGLkAIoysDIzYAUBaa4pDA7PGJ49ZG7438AQw9zA0AAUZgTJAQDrcAy8AHjaY2GAABYIDgLCBQx1AAcEAc8AeNpjYGBgZoBgGQZGBhDwAfIYwXwWBgMgzQGETAwMzxifcTx7+P8/kMUAYUkxS/6VVIXqAgNGNgY4lxGoB6QPBTAyDHsAADDkDYkAAAAAAAAAAAAAADQAagC2AN542m2QsU7DMBCG/Tt1bNPUiUnkSgiVtqKpxJAgVLVbeAa6MaK+B4JXgJWBjY21UtW5gpkdMTFX7dzApaJLhXU6n8+n//ttxtn458N79XJWZ8eMxS00C4wy9A1EP8PQncAlIQzS4WgsVtPpSmwzV3OFRqLetH5TSQMK939X61ptPZ2p2EAttNMLBRMrtschQblDeS34aY50cIkCzg/B2Y5C+VpyQxhFkRgu515O8jvU5mmPM2O0wJ5Z27vhX+yMsV437WvCdTM+GI40MgwKfuGammC0uURqeqFMfe9cxaJclkt5GMaB1hIR1VobOgpEiKq+sLZcIrJWhO3/Jw7qWlYj1Jf21FaCtmd5bevrlk28O/7A4spXTl4KTh9MTlqQ8PESBRstReic+sRj0Dni9fIqmNS/pXNWCvWOeYBmx5S9Bsn9Ah+5WtAAeNp9kD1OAzEQhZ/zByQSQiCoXVEA2vyUKRMp9Ailo0g23pBo1155nUg5AS0VB6DlGByAGyDRcgpelkmTImvt6PObmeexAZzjGwr/3yXuhBWO8ShcwREy4Sr1F+Ea+V24jhY+hRvUf4SbuFUD4RYu1BsdVO2Eu5vSbcsKZxgIV3CKJ+Eq9ZVwjfwqXMcVPoQb1L+EmxjjV7iFa2WpDOFhMEFgnEFjig3jAjEcLJIyBtahOfRmEsxMTzd6ETubOBso71dilwMeaDnngCntPbdmvkon/mDLgdSYbh4FS7YpjS4idCgbXyyc1d2oc7D9nu22tNi/a4E1x+xRDWzU/D3bM9JIbAyvkJI18jK3pBJTj2hrrPG7ZynW814IiU68y/SIx5o0dTr3bmniwOLn8owcfbS5kj33qBw+Y1kIeb/dTsQgil2GP5PYcRkAAAB42mNgYoAALjDJyIAO2MGiTIxMjMyMLIys7GmJeRmlmWZQ2pQ5OSORLaU0Mz2/FACDfwlbAAAAAf//AAIAAQAAAAwAAAAWAAAAAgABAAMABgABAAQAAAACAAAAAHjaY2BgYGQAgqtL1DlA9K2rT97DaABNlwiuAAA=) format('woff');
- font-weight: normal;
- font-style: normal;
- }
-
- .tui-iconfont {
- font-family: 'tuiDateFont' !important;
- font-size: 36rpx;
- font-style: normal;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- }
-
- .tui-font-close:before {
- content: '\e608';
- }
-
- .tui-font-check:before {
- content: '\e6e1';
- }
-
- .date-arrowright:before {
- content: '\e600';
- }
-
- .date-arrowleft:before {
- content: '\e601';
- } */
-
-
- // .calendar-radius {
- // border-top-left-radius: 20rpx;
- // border-top-right-radius: 20rpx;
- // overflow: hidden;
- // }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- .tui-btn-calendar {
- padding: 16rpx;
- box-sizing: border-box;
- text-align: center;
- text-decoration: none;
- }
-
- .l-opacity {
- opacity: 0.5;
- }
-
-
-
- .calendar-box-show {
- transform: translate3d(0, 0, 0);
- visibility: visible;
- }
-
-
-
-
-
-
-
-
-
- // .tui-lunar-unshow {
- // position: absolute;
- // left: 0;
- // bottom: 8rpx;
- // z-index: 2;
- // }
-
-
-
-
-
-
-</style>
diff --git a/minipro_standard/util/request/responseInterceptors.js b/minipro_standard/util/request/responseInterceptors.js
deleted file mode 100644
index c0640a4..0000000
--- a/minipro_standard/util/request/responseInterceptors.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * 鍝嶅簲鎷︽埅
- * @param {Object} http
- */
-module.exports = (vm) => {
- uni.$u.http.interceptors.response.use((response) => {
- uni.hideLoading();
- const data = response.data
- if (data.code === 401) { // 澶勭悊鐧诲綍杩囨湡
- uni.showToast({ title: '鐧诲綍杩囨湡锛屽噯澶囪嚜鍔ㄩ噸鏂扮櫥褰�', icon: 'none', duration: 2000, mask: true });
- setTimeout(() => {
- uni.reLaunch({ url: '/pages/login/login' });
- }, 2000)
- return
- }
- if (data.code !== 200) { // 璇锋眰鎶ラ敊
- uni.showToast({ title: data.message, icon: 'none', duration: 2000 });
- }
- return data || {}
- }, (error) => {
- uni.hideLoading();
- let code = error.code
- if (error.code === "ECONNABORTED") {
- code = 999
- }
- switch (code) {
- case 404:
- uni.showToast({ title: '璇锋眰璧勬簮涓嶅瓨鍦�', icon: 'none', duration: 2000 });
- break;
- case 500:
- uni.showToast({ title: '鏈嶅姟鍣ㄨ祫婧愰敊璇�', icon: 'none', duration: 2000 });
- break;
- case 999:
- uni.showToast({ title: '璇锋眰瓒呮椂', icon: 'none', duration: 2000 });
- break;
- }
- return Promise.reject(error)
- })
-}
--
Gitblit v1.9.3