From 2ca6dff0fc3753ff58484f4f78d7dde6d8f7adbd Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 28 八月 2023 11:49:18 +0800
Subject: [PATCH] 小程序
---
minipro_standard/components/Warehouse.vue | 22 +++
minipro_standard/pages.json | 19 ++
minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue | 333 +++++++++++++++++++++++++++++++++++++++++++++++
minipro_standard/pages_adjust/static/gongdan_ic_shoudong@2x.png | 0
minipro_standard/uni.scss | 3
web_standard/.env.development | 4
6 files changed, 376 insertions(+), 5 deletions(-)
diff --git a/minipro_standard/components/Warehouse.vue b/minipro_standard/components/Warehouse.vue
new file mode 100644
index 0000000..e663399
--- /dev/null
+++ b/minipro_standard/components/Warehouse.vue
@@ -0,0 +1,22 @@
+<template>
+ <u-popup :show="show" mode="top" @close="close" @open="open">
+ <view>
+ <text>浜虹敓鑻ュ彧濡傚垵瑙侊紝浣曚簨绉嬮鎮茬敾鎵�</text>
+ </view>
+ </u-popup>
+</template>
+
+<script>
+ export default {
+ name:"Warehouse",
+ data() {
+ return {
+
+ };
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+
+</style>
\ No newline at end of file
diff --git a/minipro_standard/pages.json b/minipro_standard/pages.json
index 4e8cdef..d4a9941 100644
--- a/minipro_standard/pages.json
+++ b/minipro_standard/pages.json
@@ -1,5 +1,6 @@
{
- "pages": [{
+ "pages": [
+ {
"path": "pages/workbench/workbench",
"style": {
"navigationBarTitleText": "宸ヤ綔鍙�",
@@ -31,7 +32,6 @@
"navigationBarTitleText": "涓汉淇℃伅",
"enablePullDownRefresh": false
}
-
}, {
"path": "pages/changePassword/changePassword",
"style": {
@@ -55,12 +55,25 @@
}
],
+ "subPackages": [
+ {
+ "root": "pages_adjust",
+ "pages": [
+ {
+ "path": "pages/addReceipt/addReceipt",
+ "style": {
+ "navigationBarTitleText": "鏂板鍏ュ簱",
+ "enablePullDownRefresh": false
+ }
+ }
+ ]
+ }
+ ],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
"navigationBarBackgroundColor": "#ffffff",
"backgroundColor": "#ffffff"
- // "navigationStyle": "custom"
},
"tabBar": {
"color": "#666666",
diff --git a/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue b/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue
new file mode 100644
index 0000000..f9a42cf
--- /dev/null
+++ b/minipro_standard/pages_adjust/pages/addReceipt/addReceipt.vue
@@ -0,0 +1,333 @@
+<template>
+ <view class="rework">
+ <view class="rework_list">
+ <view class="rework_list_item">
+ <text><b>*</b>鍗曟嵁绫诲瀷</text>
+ <view class="rework_list_item_right">
+ <text :class="form.typeName ? 'black' : ''">{{form.typeName ? form.typeName : '璇烽�夋嫨'}}</text>
+ <van-icon name="arrow" size="20" color="#999999" />
+ </view>
+ </view>
+ <view class="rework_list_item">
+ <text><b>*</b>鍏ュ簱浠撳簱</text>
+ <view class="rework_list_item_right">
+ <text :class="form.warehouseName ? 'black' : ''">{{form.warehouseName ? form.warehouseName : '璇烽�夋嫨'}}</text>
+ <van-icon name="arrow" size="20" color="#999999" />
+ </view>
+ </view>
+ </view>
+ <view class="rework_qd">
+ <view class="rework_qd_title">
+ <view class="rework_qd_title_left">
+ <view class="x"></view>
+ <text>{{`鍏ュ簱鐗╂枡娓呭崟${list.length}`}}</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>
+ <van-swipe-cell v-for="(item, index) in list" :key="index">
+ <view class="rework_qd_list">
+ <view class="rework_qd_item">
+ <text><b>*</b>鍏ュ簱璐т綅</text>
+ <view class="rework_qd_item_right">
+ <text :class="item.locationName ? 'black' : ''">{{item.locationName ? item.locationName : '璇烽�夋嫨'}}</text>
+ <van-icon name="arrow" size="20" color="#999999" />
+ </view>
+ </view>
+ <view class="rework_qd_item">
+ <text><b>*</b>鍏ュ簱鐗╂枡</text>
+ <view class="rework_qd_item_right">
+ <text :class="item.materialName ? 'black' : ''">{{item.materialName ? item.materialName : '璇烽�夋嫨'}}</text>
+ <van-icon name="arrow" size="20" color="#999999" />
+ </view>
+ </view>
+ <template v-if="form.type !== 25">
+ <view class="rework_qd_item">
+ <text>鐢熶骇宸ュ簭</text>
+ <view class="rework_qd_item_right">
+ <text :class="item.procedureName ? 'black' : ''">{{item.procedureName ? item.procedureName : '璇烽�夋嫨'}}</text>
+ <van-icon name="arrow" size="20" color="#999999" />
+ </view>
+ </view>
+ </template>
+ <view class="rework_qd_item">
+ <text><b>*</b>璐ㄩ噺灞炴��</text>
+ <view class="rework_qd_item_right">
+ <text :class="item.qualityTypeName ? 'black' : ''">{{item.qualityTypeName ? item.qualityTypeName : '璇烽�夋嫨'}}</text>
+ <van-icon name="arrow" size="20" color="#999999" />
+ </view>
+ </view>
+ <view class="rework_qd_item">
+ <text>鎵规鍙�</text>
+ <view class="rework_qd_item_right">
+ <input type="text" v-model="item.batch" placeholder="璇疯緭鍏�" />
+ </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">
+ <input type="text" v-model="item.num" placeholder="0" />
+ </view>
+ </view>
+ </view>
+ <template #right>
+ <van-button style="height: 100%;" square type="danger" text="鍒犻櫎" @click="dele(index)" />
+ </template>
+ </van-swipe-cell>
+ </view>
+ <view class="rework_zw"></view>
+ <view class="rework_footer">
+ <button class="rework_footer_submit">鎻愪氦</button>
+ </view>
+ <u-toast ref="uToast"></u-toast>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+ form: {
+ warehouseName: '',
+ warehouseId: '',
+ type: '',
+ typeName: ''
+ },
+ list: []
+ };
+ },
+ methods: {
+ addItem() {
+ if (!this.form.warehouseId) return this.$refs.uToast.show({ type: 'default', message: "璇烽�夋嫨鍏ュ簱浠撳簱" })
+ this.list.push({
+ 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: ''
+ })
+ },
+ // 鍒犻櫎
+ dele(index) {
+ if (this.list.length === 1) {
+ this.$refs.uToast.show({ type: 'default', message: "鑷冲皯淇濈暀涓�鏉″伐瑁呬俊鎭�" })
+ return
+ }
+ this.list.splice(index, 1)
+ }
+ }
+ }
+</script>
+
+<style lang="scss" scoped>
+ .rework {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ .rework_list {
+ display: flex;
+ flex-direction: column;
+ background: white;
+ 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/static/gongdan_ic_shoudong@2x.png b/minipro_standard/pages_adjust/static/gongdan_ic_shoudong@2x.png
new file mode 100644
index 0000000..c4f8fb8
--- /dev/null
+++ b/minipro_standard/pages_adjust/static/gongdan_ic_shoudong@2x.png
Binary files differ
diff --git a/minipro_standard/uni.scss b/minipro_standard/uni.scss
index 98bb242..3bc1c4c 100644
--- a/minipro_standard/uni.scss
+++ b/minipro_standard/uni.scss
@@ -14,6 +14,9 @@
/* 棰滆壊鍙橀噺 */
@import '@/uni_modules/uview-ui/theme.scss';
+
+$nav-color: #4275FC;
+
/* 琛屼负鐩稿叧棰滆壊 */
$uni-color-primary: #007aff;
$uni-color-success: #4cd964;
diff --git a/web_standard/.env.development b/web_standard/.env.development
index 1d53d1c..9b93c1d 100644
--- a/web_standard/.env.development
+++ b/web_standard/.env.development
@@ -14,11 +14,11 @@
VUE_APP_API_PREFIX = ''
# 鐒︽澗
-VUE_APP_BASE_URL = 'http://192.168.0.36:10021/'
+# VUE_APP_BASE_URL = 'http://192.168.0.36:10021/'
# VUE_APP_BASE_URL = 'http://192.168.0.134:10021/'
# 浠诲悍鏈湴
-# VUE_APP_BASE_URL = 'http://192.168.0.15:10021/'
+VUE_APP_BASE_URL = 'http://192.168.0.15:10021/'
# 姹熻悕
# VUE_APP_BASE_URL = 'http://192.168.0.35:10021/'
--
Gitblit v1.9.3