改bug

api/common.js

@@ -1,4 +1,8 @@
-import { postJ, post, get } from '@/utils/request'
+import {
+	postJ,
+	post,
+	get
+} from '@/utils/request'
 import Vue from 'vue'
 
 /**
@@ -90,3 +94,14 @@ export async function getParentIdListByDeptId(id) {
 	}
 	return Promise.reject(new Error(res.message))
 }
+
+// 获取字典
+export async function getDictByCode(code) {
+	const data = await get(
+		Vue.prototype.apiUrl + `/system/dict/getByCode/${code}`,
+	);
+	if (data.code == 0) {
+		return data.data;
+	}
+	return Promise.reject(data.message);
+}

pages/center/center.vue

@@ -1,155 +1,146 @@
 <template>
-  <view class="content">
-    <view class="logo_bg">
-      <view class="logo-content">
-        <image :src="src1" model="aspectFit "></image>
-        <view class="user_name">
-          <view>{{ userInfo.name  }}</view>
-          <view>{{ userInfo.groupName }}</view>
-        </view>
-        <uni-icons
-          class="tuichu"
-          type="gear"
-          @click="goSystemSettings"
-          size="38"
-          color="#fff"
-        ></uni-icons>
-      </view>
-    </view>
-    <view class="bg_content">
-      <view class="tab-data">
-        <label class="tab-lable">我的任务</label>
-        <view class="tab-content">
-			  <!-- @click="onDataOrderTab(index)" -->
-          <label
-            :class="{ 'data-action': DataOrderType == index }"
-          
-            v-for="(item, index) in taskList"
-            >{{ item.name }}</label
-          >
-        </view>
-      </view>
-      <view class="tab">
-        <view class="tab-content">
-          <view class="tab-content-title">
-            <label>{{ taskList[DataOrderType].workNum }}</label
-            ><label>总工单(次)</label></view
-          >
-          <view class="tab-content-title">
-            <label>{{ taskList[DataOrderType].manHour }}</label
-            ><label>总工时(小时)</label></view
-          >
-        </view>
-        <label class="tab-check-lable" @click="gomiss">查看详情</label>
-      </view>
-      <view class="options">
-        <image src="../../static/sop.jpg" model="aspectFit "></image>
-      </view>
-<!--      <view class="notice" @click="goAbout">
+	<view class="content">
+		<view class="logo_bg">
+			<view class="logo-content">
+				<image :src="src1" model="aspectFit "></image>
+				<view class="user_name">
+					<view>{{ userInfo.name  }}</view>
+					<view>{{ userInfo.groupName }}</view>
+				</view>
+				<uni-icons class="tuichu" type="gear" @click="goSystemSettings" size="38" color="#fff"></uni-icons>
+			</view>
+		</view>
+		<view class="bg_content">
+			<view class="tab-data">
+				<label class="tab-lable">我的任务</label>
+				<view class="tab-content">
+					<!-- @click="onDataOrderTab(index)" -->
+					<label :class="{ 'data-action': DataOrderType == index }"
+						v-for="(item, index) in taskList">{{ item.name }}</label>
+				</view>
+			</view>
+			<view class="tab">
+				<view class="tab-content">
+					<view class="tab-content-title">
+						<label>{{ taskList[DataOrderType].workNum }}</label><label>总工单(次)</label>
+					</view>
+					<view class="tab-content-title">
+						<label>{{ taskList[DataOrderType].manHour }}</label><label>总工时(小时)</label>
+					</view>
+				</view>
+				<label class="tab-check-lable" @click="gomiss">查看详情</label>
+			</view>
+			<view class="options">
+				<image src="../../static/sop.jpg" model="aspectFit "></image>
+			</view>
+			<!--      <view class="notice" @click="goAbout">
         <image class="icon" src="@/static/u79.svg" model="aspectFit "></image>
         <text class="text1">关于株洲硬质合金集团型材分公司</text>
         <text class="iconfont icon-youjiantou icos"></text>
       </view> -->
-    </view>
-  </view>
+		</view>
+	</view>
 </template>
 
 <script>
-import { postJ } from '@/utils/api.js'
-import dayjs from 'dayjs'
-export default {
-  data () {
-    return {
-      src1: 'https://cdn.uviewui.com/uview/album/1.jpg',
-      userInfo: null,
-      DataOrderType: 0,
-      taskList: [
-        {
-          name: '今天',
-          type: 'day',
-          list: [],
-          workNum: '',
-          manHour: ''
-        },
-        {
-          name: '本周',
-          type: 'week',
-          list: [],
-          workNum: '',
-          manHour: ''
-        },
-        {
-          name: '本月',
-          type: 'month',
-          list: [],
-          workNum: '',
-          manHour: ''
-        }
-      ]
-    }
-  },
-  onLoad () {
-    this.userInfo = uni.getStorageSync('userInfo')
-    console.log(this.userInfo)
-    // this.getdata()
-  },
-  methods: {
-    click (name) {
-      console.log('click', name)
-    },
-    onDataOrderTab (index) {
-      this.DataOrderType = index
-      this.getdata()
-    },
-    getdata () {
-      let par = {
-        endTime: '',
-        startTime: ''
-      }
-      let type = this.taskList[this.DataOrderType].type
-      switch (type) {
-        case 'day':
-          par.startTime = dayjs().startOf('day').format('YYYY-MM-DD')
-          par.endTime = dayjs().endOf('day').format('YYYY-MM-DD')
-          break
-        case 'week':
-          par.startTime = dayjs().startOf('week').format('YYYY-MM-DD')
-          par.endTime = dayjs().endOf('week').format('YYYY-MM-DD')
-          break
-        case 'month':
-          par.startTime = dayjs().startOf('month').format('YYYY-MM-DD')
-          par.endTime = dayjs().endOf('month').format('YYYY-MM-DD')
-          break
-        default:
-          break
-      }
-      postJ(this.apiUrl + '/workOrder/getMyTaskStatistics', par).then(res => {
-        if (res.success) {
-          this.taskList[this.DataOrderType].workNum = res.data.num
-          this.taskList[this.DataOrderType].manHour = res.data.workingHours
-        }
-      })
-    },
-    goAbout () {
-      // uni.navigateTo({
-      //   url: './about/about'
-      // })
-    },
-    gomiss () {
-      uni.navigateTo({
-        url: '/pages/home/work/work'
-      })
-    },
+	import xyy from '@/assets/xyy.jpg'
+	import {
+		postJ
+	} from '@/utils/api.js'
+	import dayjs from 'dayjs'
+	export default {
+		data() {
+			return {
+				src1: '',
+				userInfo: null,
+				DataOrderType: 0,
+				taskList: [{
+						name: '今天',
+						type: 'day',
+						list: [],
+						workNum: '',
+						manHour: ''
+					},
+					{
+						name: '本周',
+						type: 'week',
+						list: [],
+						workNum: '',
+						manHour: ''
+					},
+					{
+						name: '本月',
+						type: 'month',
+						list: [],
+						workNum: '',
+						manHour: ''
+					}
+				]
+			}
+		},
+		onLoad() {
+			this.userInfo = uni.getStorageSync('userInfo')
+			this.src1 = this.userInfo?.avatar[0]?.url || xyy
+			console.log(this.userInfo)
+			// this.getdata()
+		},
+		methods: {
+			click(name) {
+				console.log('click', name)
+			},
+			onDataOrderTab(index) {
+				this.DataOrderType = index
+				this.getdata()
+			},
+			getdata() {
+				let par = {
+					endTime: '',
+					startTime: ''
+				}
+				let type = this.taskList[this.DataOrderType].type
+				switch (type) {
+					case 'day':
+						par.startTime = dayjs().startOf('day').format('YYYY-MM-DD')
+						par.endTime = dayjs().endOf('day').format('YYYY-MM-DD')
+						break
+					case 'week':
+						par.startTime = dayjs().startOf('week').format('YYYY-MM-DD')
+						par.endTime = dayjs().endOf('week').format('YYYY-MM-DD')
+						break
+					case 'month':
+						par.startTime = dayjs().startOf('month').format('YYYY-MM-DD')
+						par.endTime = dayjs().endOf('month').format('YYYY-MM-DD')
+						break
+					default:
+						break
+				}
+				postJ(this.apiUrl + '/workOrder/getMyTaskStatistics', par).then(res => {
+					if (res.success) {
+						this.taskList[this.DataOrderType].workNum = res.data.num
+						this.taskList[this.DataOrderType].manHour = res.data.workingHours
+					}
+				})
+			},
+			goAbout() {
+				// uni.navigateTo({
+				//   url: './about/about'
+				// })
+			},
+			gomiss() {
+				uni.navigateTo({
+					url: '/pages/home/work/work'
+				})
+			},
 
-    goSystemSettings () {
-      uni.navigateTo({
-        url: '/pages/systemSettings/index'
-      })
-    }
-  }
-}
+			goSystemSettings() {
+				uni.navigateTo({
+					url: '/pages/systemSettings/index'
+				})
+			}
+		}
+	}
 </script>
 
 <style lang="scss" scoped>
-@import 'center.scss';
-</style>
+	@import 'center.scss';
+</style>

pages/maintenanceWorkorder/order/order.vue

@@ -14,8 +14,9 @@
 			<view class="tab_box rx-sc">
 				<view class="tab_item" v-for="(item,index) in tabList" :key="index"
 					:class="{active: pickTabIndex == index}">
-					<view @click="changeChartsTab(index)">
+					<view @click="changeChartsTab(index)" class="badge-c">
 						{{item.label}}
+						<u-badge max="99" :value="item.number" absolute ></u-badge>
 						<!-- <text v-if="item.number > 0" class="title-red">{{ item.number }}</text> -->
 					</view>
 				</view>
@@ -105,6 +106,8 @@
 					pageNum: 1,
 					size: 1
 				}).then(res => {
+					console.log(res);
+					this.tabList
 					this.tabList[0].number = res.count
 				})
 				getWorkOrderList({
@@ -121,7 +124,7 @@
 					pageNum: 1,
 					size: 1
 				}).then(res => {
-					this.tabList[2].number = res.count
+					// this.tabList[2].number = res.count
 				})
 				getWorkOrderList({
 					orderStatus: [4],
@@ -129,7 +132,7 @@
 					pageNum: 1,
 					size: 1
 				}).then(res => {
-					this.tabList[3].number = res.count
+					// this.tabList[3].number = res.count
 				})
 				// /eam/PdaWorkOrder/assistList
 			},
@@ -273,6 +276,16 @@
 
 		}
 	}
+	
+	.badge-c {
+		position: relative;
+	}
+	
+	/deep/.u-badge {
+		top: 0;
+		right: 0;
+		transform: translate(90%, 20%);
+	}
 
 	// .tab-title {
 	// 	position: fixed;

pages/saleManage/businessOpportunity/components/drawer.vue

@@ -220,7 +220,7 @@
 			margin-top: 32rpx;
 			display: flex;
 			flex-wrap: wrap;
-			height: 80rpx;
+			// height: 80rpx;
 			border-radius: 12rpx;
 			border: 1px solid #cbcbcb;
 

pages/saleManage/components/selectContact.vue

@@ -3,7 +3,8 @@
 		<uni-nav-bar fixed="true" statusBar="true" left-icon="back" title="选择" @clickLeft="backAdd">
 			<!--右菜单-->
 			<template slot="right">
-				<u-button type="success" size="small" class="u-reset-button" @click="$refs.treePicker._show()" text="选择分类"></u-button>
+				<u-button type="success" size="small" class="u-reset-button" @click="$refs.treePicker._show()"
+					text="选择分类"></u-button>
 			</template>
 		</uni-nav-bar>
 		<view class="searchBox">
@@ -19,14 +20,15 @@
 					<label>
 						<view class="listBox">
 							<view class="listBox-sel">
-								<checkbox :value="item.code" color="#fff" :disabled="item.disabled" :checked="item.checked" />
+								<checkbox :value="item.code" color="#fff" :disabled="item.disabled"
+									:checked="item.checked" />
 							</view>
 							<view class="listBox-con">
 								<view class="listBox-top">
 									<view class="listBox-name">
 										{{ item.name }}
 									</view>
-								
+
 								</view>
 								<view class="listBox-bottom">
 									<!-- <view v-for="(itm, index) in tableHeader" :key="index">{{ itm.label }}：{{ item[itm.prop] }}</view> -->
@@ -47,20 +49,22 @@
 		<view class="footer">
 			<view class="bottom" v-if="this.isAll==1">
 				<checkbox v-if="!seletedAll" color="#fff" :checked="seletedAll" @tap="_seletedAll">全选</checkbox>
-				<checkbox class="select-all" color="#fff" v-else :checked="seletedAll" @tap="_seletedAll">取消全选</checkbox>
+				<checkbox class="select-all" color="#fff" v-else :checked="seletedAll" @tap="_seletedAll">取消全选
+				</checkbox>
 			</view>
 			<u-button type="success" size="small" class="u-reset-button" :disabled="!checkListLen" @click="jumpAdd">
 				<view class="selBtn">选择( {{ checkListLen }} )</view>
 			</u-button>
 		</view>
-		<ba-tree-picker ref="treePicker" key="verify" :multiple="false" @select-change="confirm" title="选择分类" :localdata="classificationList" valueKey="id" textKey="name" />
+		<ba-tree-picker ref="treePicker" key="verify" :multiple="false" @select-change="confirm" title="选择分类"
+			:localdata="classificationList" valueKey="id" textKey="name" />
 	</view>
 </template>
 
 <script>
 	import {
 		contactPage,
-	
+
 	} from '@/api/saleManage/contact/index.js'
 	import {
 		getTreeByPid
@@ -70,7 +74,7 @@
 		components: {
 			baTreePicker
 		},
-     
+
 		data() {
 			return {
 				page: 1,
@@ -83,29 +87,31 @@
 				listData: [], //列表数据
 				classificationList: [], //分类数据
 				seletedAll: false, //全选状态,
-				isAll:'',
-				isDemand:''
+				isAll: '',
+				isDemand: ''
 			}
 		},
 		//选择的列表长度
 		computed: {
-		
+
 			checkListLen() {
 
 				return this.listData.filter(el => el.checked).length
 			},
-		
+
 		},
-		onLoad({ isAll , type}) {
+		onLoad({
+			isAll,
+			type
+		}) {
 			this.isAll = isAll //1多选 2单选
 			// *** 新增 需求进来的话 要增加查询条件
-			if(type == '需求'){
+			if (type == '需求') {
 				this.isDemand = '1'
 			}
 			this.getClassify()
 		},
-		onShow() {
-		},
+		onShow() {},
 		methods: {
 			scrolltolower() {
 				if (this.isEnd) {
@@ -135,7 +141,7 @@
 					categoryId: this.categoryLevelId
 				}
 				// 需求新增参数 *** 
-				if(this.isDemand == '1'){
+				if (this.isDemand == '1') {
 					params.type = '1'
 					params.status = '1'
 				}
@@ -151,6 +157,8 @@
 			confirm([id]) {
 				this.categoryLevelId = id
 				this.page = 1
+				this.listData.forEach(item => item.checked = false)
+
 				this.getList()
 			},
 			async getClassify() {
@@ -166,20 +174,20 @@
 			},
 			//勾选
 			selectVal(e, val, index) {
-				
+
 				this.$set(this.listData[index], 'checked', !this.listData[index].checked)
 
-				if(this.isAll!=1){
-					this.listData.forEach((item,i)=>{
-						if(item.id!=val.id){
+				if (this.isAll != 1) {
+					this.listData.forEach((item, i) => {
+						if (item.id != val.id) {
 							this.$set(this.listData[i], 'checked', false)
 						}
 					})
-				}else{
-					
+				} else {
+
 					this.seletedAll = !this.listData.some(item => !item.checked)
 				}
-				
+
 			},
 			//全选按钮
 			_seletedAll() {
@@ -221,10 +229,12 @@
 		height: 100vh;
 		display: flex;
 		flex-direction: column;
+
 		.wrapper {
 			flex: 1;
 			overflow: hidden;
 		}
+
 		.searchBox {
 			padding: 10rpx 0;
 			box-sizing: border-box;
@@ -256,6 +266,7 @@
 				outline: none;
 				border: none;
 				width: 260rpx;
+
 				.icon-sousuo {
 					font-size: 22px;
 				}
@@ -318,6 +329,7 @@
 
 		.listContent {
 			height: 100% !important;
+
 			.listBox {
 				display: flex;
 				// height: 180rpx;
@@ -363,7 +375,8 @@
 						justify-content: space-between;
 						font-size: $uni-font-size-sm;
 						flex-wrap: wrap;
-						> view {
+
+						>view {
 							width: 50%;
 							overflow: hidden;
 							white-space: nowrap;
@@ -372,6 +385,7 @@
 					}
 				}
 			}
+
 			.noDate {
 				height: 100%;
 			}
@@ -403,4 +417,4 @@
 			}
 		}
 	}
-</style>
+</style>

pages/salesServiceManagement/workOrder/components/accessoryAdd.vue

@@ -412,6 +412,217 @@
 </script>
 
 <style scoped lang="scss">
-	@import url('@/pages/salesServiceManagement/demandList/components/invoice.scss');
-	@import './accessory.scss';
+	// @import url('@/pages/salesServiceManagement/demandList/components/invoice.scss');
+	
+	
+	
+	.listContent {
+		height: 100% !important;
+	
+		.listBox {
+			display: flex;
+			// height: 180rpx;
+			padding: 20rpx 0;
+			border-bottom: 2rpx solid #e5e5e5;
+	
+			.listBox-sel {
+				height: 90rpx;
+				width: 80rpx;
+				// line-height: 90rpx;
+				text-align: center;
+	
+				checkbox {
+					transform: scale(1.2);
+				}
+			}
+		}
+		
+		.listBox-con {
+			width: 100%;
+			// display: flex;
+			// flex-wrap: wrap;
+			// justify-content: space-between;
+			align-items: center;
+			padding: 0 18rpx 0 0;
+		
+			.listBox-top {
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+				padding-bottom: 10rpx;
+		
+				.listBox-name,
+				.listBox-code {
+					display: inline-block;
+					font-size: $uni-font-size-sm;
+					font-weight: bold;
+				}
+			}
+		
+			.listBox-bottom {
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+				font-size: $uni-font-size-sm;
+				flex-wrap: wrap;
+		
+				>view {
+					width: 100%;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+		
+				.half {
+					width: 50%;
+				}
+				
+				.label-s{
+					width: 50%;
+					display: inline-block !important;
+				}
+			}
+		}
+	
+		.noDate {
+			height: 100%;
+		}
+	}
+	
+	
+	
+	.mainBox {
+			height: 100vh;
+			display: flex;
+			flex-direction: column;
+	
+			.wrapper {
+				// flex: 1;
+				height: calc(100vh - 250rpx);
+				overflow: hidden;
+			}
+	
+			//底部按钮
+			.footer {
+				height: 45px;
+				position: relative;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				bottom: 0;
+				width: 100%;
+				height: 50px;
+				border-top: 1px solid #eeecec;
+				background-color: #ffffff;
+				z-index: 999;
+	
+				.bottom {
+					margin-left: 10rpx;
+				}
+	
+				.u-reset-button {
+					position: absolute;
+					right: 10rpx;
+					top: 20rpx;
+					width: 150rpx;
+				}
+			}
+	
+			.top-wrapper {
+				background-color: #fff;
+				display: flex;
+				width: 750rpx;
+				height: 88rpx;
+				padding: 16rpx 32rpx;
+				align-items: center;
+				gap: 16rpx;
+	
+				/deep/.uni-section {
+					margin-top: 0px;
+				}
+	
+				/deep/.uni-section-header {
+					padding: 0px;
+	
+				}
+	
+				.search_btn {
+					width: 120rpx;
+					height: 70rpx;
+					line-height: 70rpx;
+					padding: 0 24rpx;
+					background: $theme-color;
+					font-size: 32rpx;
+					color: #fff;
+					margin: 0;
+					margin-left: 26rpx;
+				}
+	
+				.menu_icon {
+					width: 44rpx;
+					height: 44rpx;
+					margin-left: 14rpx;
+				}
+			}
+	
+			.dimension {
+				width: calc(100% - 270rpx);
+			}
+	
+			.nav_box {
+				padding: 6rpx 32rpx;
+				position: relative;
+	
+				.btn {
+					width: 68rpx;
+					text-align: center;
+					background: #1890ff;
+					color: #fff;
+					border: 2rpx solid;
+					border-color: #1890ff;
+					height: 40rpx;
+					line-height: 40rpx;
+					font-size: 26rpx;
+					margin-right: 10rpx;
+				}
+	
+				.remove {
+					color: #606266;
+					border-color: #dddddd;
+					background: #fff;
+				}
+	
+				.nav_item {
+					font-size: 28rpx;
+					font-weight: 400;
+					color: $theme-color;
+					background: #F0F8F2;
+					margin-right: 16rpx;
+					padding: 4rpx 16rpx;
+					border-radius: 8rpx;
+					border: 2rpx solid #ACD4B5;
+	
+				}
+	
+				.menu_box {
+					position: absolute;
+					right: 20rpx;
+					top: 10rpx;
+	
+					.menu_icon {
+						width: 44rpx;
+						height: 44rpx;
+					}
+	
+				}
+	
+				.active {
+					background: $theme-color;
+					border: 2rpx solid $theme-color;
+					color: #FFF;
+				}
+			}
+		}
+	
+	// @import './accessory.scss';
 </style>

pages/salesServiceManagement/workOrder/index.vue

@@ -38,13 +38,21 @@
 		<CheckAndAccept ref="acceptRef" @getList='doSearch' />
 		<Evaluate ref="evaluateRef" @getList='doSearch' />
 		<u-toast ref="uToast"></u-toast>
-		<MySearch :show.sync="searchShow" :formItems="formItems" @search="confirmSearch" ></MySearch>
+		<MySearch :show.sync="searchShow" :formItems="formItems" @search="confirmSearch"></MySearch>
 	</view>
 </template>
 
 <script>
 	// import MyPicker from '@/uni_modules/uview-ui/components/u-picker/u-picker.vue'
 
+	import {
+		getByCode
+	} from '@/api/pda/common.js'
+
+	import {
+		initDict
+	} from '@/utils/utils.js'
+
 
 	import {
 		getSalesWorkOrder,
@@ -53,18 +61,33 @@
 	import myCard from '@/pages/saleManage/components/myCard.vue'
 	import CheckAndAccept from './components/forWork/checkAndAccept.vue'
 	import Evaluate from './components/forWork/evaluate.vue'
+	import {
+		login
+	} from '../../../api/common'
 	export default {
 		components: {
 			myCard,
 			CheckAndAccept,
 			Evaluate,
 		},
+		watch: {
+			fault_level_arr: {
+				handler(val) {
+					console.log(val);
+					this.formItems.find(item => item.prop === 'faultLevel').props.localdata = val
+				},
+				deep: true
+			}
+		},
+
 
 		data() {
 			return {
 				searchForm: {},
 				emptyShow: false,
 				searchShow: false,
+				fault_level_obj: {},
+				fault_level_arr: [],
 				formItems: [{
 						label: '工单编号：',
 						prop: 'code',
@@ -94,15 +117,9 @@
 						prop: 'faultLevel',
 						component: 'MySelect',
 						props: {
-							localdata: [{
-								label: '一般',
-								value: 1
-							}, {
-								label: '紧急',
-								value: 2
-							}],
-							dataKey:'label',
-							dataValue:'value'
+							localdata: [],
+							dataKey: 'label',
+							dataValue: 'value'
 						}
 					},
 					{
@@ -222,7 +239,11 @@
 					}],
 					[{
 						label: '故障等级：',
-						prop: 'faultLevel'
+						prop: 'faultLevel',
+						formatter: (row) => {
+							console.log();
+							return this.fault_level_obj[row.faultLevel]
+						}
 					}, {
 						label: '客户名称：',
 						prop: 'contactName',
@@ -384,7 +405,10 @@
 		},
 		computed: {},
 		onLoad() {
-			console.log(this.$refs.uToast);
+
+			this.getDict()
+
+
 
 		},
 		onShow() {
@@ -397,6 +421,15 @@
 			this.getList()
 		},
 		methods: {
+			async getDict() {
+				let res = await getByCode('fault_level')
+				let [arr, obj] = initDict(res)
+				this.fault_level_obj = obj
+				this.fault_level_arr = arr
+				console.log(arr, obj);
+			},
+
+
 			changeChartsTab(value) {
 				this.pickTabIndex = value;
 				this.doSearch();
@@ -508,7 +541,7 @@
 				this.searchForm = data
 				this.doSearch()
 			},
-			
+
 		}
 	}
 </script>

pages/systemSettings/index.vue

@@ -15,11 +15,11 @@
           apiAdress
         }}</text>
 			</u-cell>
-			<u-cell :title="'当前版本 ' + currentVersion" :isLink="true" arrow-direction="right">
+		<!-- 	<u-cell :title="'当前版本 ' + currentVersion" :isLink="true" arrow-direction="right">
 				<text slot="value" class="u-slot-value" @click="handlUpdate">{{
           Nversion == currentVersion ? '' : `发现新版本(${this.Nversion})`
         }}</text>
-			</u-cell>
+			</u-cell> -->
 		</u-cell-group>
 		<view class="flex-buttom">
 			<view class="btn" @click="loginOut"> 退出登录 </view>
@@ -63,15 +63,20 @@
 				VersionInfo: ''
 			}
 		},
-		created() {
+		onLoad() {
 			const apiInfo = uni.getStorageSync('apiInfo')
 
 			this.apiAdress =
 				apiInfo.hostname &&
 				`${apiInfo.protocal || ''}${apiInfo.hostname || ''}:${apiInfo.port || ''}`
+				
+				console.log(plus);
 
 			this.currentVersion = plus?.runtime.version
-			this.getbb()
+			// this.getbb()
+		},
+		created() {
+
 		},
 		methods: {
 			handlePicker(e) {
@@ -127,6 +132,7 @@
 
 									})
 									.catch(err => {
+										console.log(err);
 										uni.showToast({
 											title: '退出失败',
 											icon: 'none'
@@ -147,9 +153,12 @@
 			},
 			handlUpdate() {
 				get(this.apiUrl + '/versioning/getLatestData').then(res => {
+					console.log(res);
 					if (res.success) {
 						const currentVersion = this.currentVersion
 						const Nversion = res.data.version
+						
+						console.log(currentVersion,Nversion);
 						this.VersionInfo = res.data
 						if (currentVersion !== Nversion) {
 							this.$refs.updatePop.open()

pages/warehouse/enterHouse/index.vue

@@ -281,7 +281,7 @@
 		min-height: 100rpx;
 
 		/deep/ .baseForm {
-			padding: 0 20rpx;
+			padding:  40rpx 20rpx 20rpx 20rpx;
 		}
 	}
 

pages/warehouse/inventoryAllocation/index.vue

@@ -306,7 +306,7 @@
 		min-height: 100rpx;
 
 		/deep/ .baseForm {
-			padding: 0 20rpx;
+			padding: 40rpx 20rpx 20rpx 20rpx;
 		}
 	}
 

pages/warehouse/outHouse/index.vue

@@ -266,7 +266,7 @@
 		min-height: 100rpx;
 
 		/deep/ .baseForm {
-			padding: 0 20rpx;
+			padding:  40rpx 20rpx 20rpx 20rpx;
 		}
 	}
 

store/index.js

@@ -18,6 +18,8 @@ const modules = modulesFiles.keys().reduce((modules, modulePath) => {
   return modules;
 }, {});
 
+console.log(modules);
+
 const store = new Vuex.Store({
   modules,
   mutations,

uni_modules/zxz-uni-data-select/components/zxz-uni-data-select/zxz-uni-data-select.vue

@@ -557,7 +557,7 @@
 		width: 100%;
 		flex: 1;
 		box-sizing: border-box;
-		background: #F0F8F2;
+		background: #fff;
 	}
 
 	.uni-stat-box {

utils/utils.js

@@ -30,6 +30,22 @@ export function getDateNew(type = 'day') {
 	return `${year}-${month}-${day}`;
 }
 
+export function initDict(originalData) {
+	let obj = {}
+	let arr = originalData.map(item => {
+		const key = Object.keys(item)[0]
+		const value = item[key]
+		obj[key] = value
+		return {
+			label: value,
+			value: parseInt(key)
+		}
+	})
+	return [arr, obj]
+}
+
+
+
 export function stopScroll() {
 	var box = function(e) {
 		passive: false;