From 5a00aaf5c81814dfe3640c8f74c44a05b5ef059a Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Mon, 9 Sep 2024 13:33:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B4=E6=8E=A5=E5=AE=8C?=
 =?UTF-8?q?=E5=B7=A5=E5=8A=9F=E8=83=BD2024/7/18=2017:24:08?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request2.js                           |   4 +
 src/common/style/new_style.css                |  54 +-
 src/mycomponents/balance/location.vue         |   2 +-
 src/mycomponents/balance/toLocation.vue       |  30 +-
 src/mycomponents/item/itemCompareQty.vue      |   4 +-
 src/mycomponents/job/jobComMainDetailCard.vue |   2 +-
 src/mycomponents/qty/recommendQty.vue         | 108 +--
 src/pages/fg/coms/comReceiptPopup.vue         |  85 +-
 .../components/u-select/u-select.vue          | 781 +++++++++---------
 9 files changed, 528 insertions(+), 542 deletions(-)

diff --git a/src/api/request2.js b/src/api/request2.js
index 84c1664b..cf3cb625 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -2647,4 +2647,8 @@ export  function getPlaneInfoByproductLine(productionLine,planDate) {
 
 export  function planReceiptSubmit(data) {
 	return http.post("/wms/production-main/getPlanProductionByProductionLineAndPlanDate",data)
+}
+
+export function getProductionlineAndWorkStation() {
+	return http.get("/wms/production-main/getProductionlineAndWorkStation")
 }
\ No newline at end of file
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index 33875327..ed9cf986 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2076,6 +2076,11 @@ button::after {
 	color:#2E3A63;
 	margin-left:20rpx
 }
+.card_big_content {
+	font-size: 40rpx;
+	font-weight: bold;
+	padding: 5px;
+}
 
 .card_icon_normal {
 	width: 30rpx;
@@ -2084,22 +2089,24 @@ button::after {
 	margin-right:12rpx
 }
 
-.card_packing_code {
-	color: #1677FF;
-	font-size: 26rpx;
-	font-style: italic;
-}
-
-.card_batch {
-	color: #9747FF;
-	font-size: 26rpx;
-	font-style: italic;
-}
+.card_packing_code {
+	color: #3315EB;
+	padding: 5px;
+	font-size: 30rpx;
+}
+
+.card_batch {
+	color: #9747FF;
+	padding: 5px;
+	font-size: 30rpx;
+}
+
+.card_container {
+	color: #0076F6;
+	padding: 5px;
+	font-size: 30rpx;
+}
 
-.card_container {
-	color: #0076F6;
-	padding: 5px;
-}
 
 
 .card_container_content {
@@ -2495,11 +2502,18 @@ button[disabled] {
 	justify-content: space-between;
 }
 
-.text_recommend {
-	color: #0A84FF;
-	font-size: 38rpx;
-	font-weight:bold
-}
+.text_recommend {
+	color: #0A84FF;
+	font-size: 34rpx;
+	font-weight: bold;
+}
+
+.text_packQty {
+	color: #3315EB;
+	font-size: 40rpx;
+	font-weight: bold;
+}
+
 
 .text_balance {
 	font-size: 36rpx;
diff --git a/src/mycomponents/balance/location.vue b/src/mycomponents/balance/location.vue
index 27f275b9..dddbfa35 100644
--- a/src/mycomponents/balance/location.vue
+++ b/src/mycomponents/balance/location.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="card_view">
     <text class="card_location">{{ title }}</text>
-    <text class="card_content" style="font-size: 37rpx">{{ locationCode }}</text>
+    <text class="card_big_content" style="font-size: 40rpx">{{ locationCode }}</text>
   </view>
 </template>
 
diff --git a/src/mycomponents/balance/toLocation.vue b/src/mycomponents/balance/toLocation.vue
index 84f2c8bf..8240601e 100644
--- a/src/mycomponents/balance/toLocation.vue
+++ b/src/mycomponents/balance/toLocation.vue
@@ -1,21 +1,19 @@
 <template>
-	<view class="card_view ">
-		<text class="card_to_location">{{title}}</text>
-		<text class="card_content ">{{locationCode}}</text>
-	</view>
+  <view class="card_view">
+    <text class="card_to_location">{{ title }}</text>
+    <text class="card_content">{{ locationCode }}</text>
+  </view>
 </template>
 <script setup lang="ts">
-	const props = defineProps({
-		locationCode: {
-			type: String,
-		},
-		title: {
-			type: String,
-			default: '库位'
-		},
-		
-	})
+const props = defineProps({
+  locationCode: {
+    type: String
+  },
+  title: {
+    type: String,
+    default: '库位'
+  }
+})
 </script>
 
-<style>
-</style>
+<style></style>
diff --git a/src/mycomponents/item/itemCompareQty.vue b/src/mycomponents/item/itemCompareQty.vue
index 82e36972..aeaad128 100644
--- a/src/mycomponents/item/itemCompareQty.vue
+++ b/src/mycomponents/item/itemCompareQty.vue
@@ -3,8 +3,8 @@
     <view style="flex: 1">
       <item :dataContent="dataContent"></item>
     </view>
-    <view style="width: 30%; display: flex; justify-content: flex-end; margin-right: 10rpx">
-      <recommend-qty v-if="handleQty == 0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack="true" :objTextStyle="objTextStyle"></recommend-qty>
+    <view style="width: 40%; display: flex; justify-content: flex-end; margin-right: 10rpx">
+      <recommend-qty v-if="handleQty == 0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack="true"></recommend-qty>
       <compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)" :handleQty="Number(handleQty)" :isShowStatus="false" :isShowPackUnit="isShowPackUnit"> </compare-qty>
     </view>
   </view>
diff --git a/src/mycomponents/job/jobComMainDetailCard.vue b/src/mycomponents/job/jobComMainDetailCard.vue
index 3707c201..fbffa63c 100644
--- a/src/mycomponents/job/jobComMainDetailCard.vue
+++ b/src/mycomponents/job/jobComMainDetailCard.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="">
     <view class="task_text" style="border-top: 1px solid #dedede; padding-top: 20rpx">
-      <itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowPackUnit="false" :objTextStyle="{ fontWeight: 'bold', fontSize: '40rpx' }"></itemCompareQty>
+      <itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowPackUnit="false"></itemCompareQty>
       <div>
         <pack v-if="isShowPack && dataContent.packingNumber != null" :packingCode="dataContent.packingNumber"> </pack>
         <batch v-if="isShowBatch && dataContent.batch != null" :batch="dataContent.batch"></batch>
diff --git a/src/mycomponents/qty/recommendQty.vue b/src/mycomponents/qty/recommendQty.vue
index adebd633..f96d422f 100644
--- a/src/mycomponents/qty/recommendQty.vue
+++ b/src/mycomponents/qty/recommendQty.vue
@@ -1,58 +1,64 @@
 <template>
-	<view>
-		<status v-if="isShowStatus" :status='dataContent.inventoryStatus'></status>
+  <view>
+    <status v-if="isShowStatus" :status="dataContent.inventoryStatus"></status>
 
-		<view class="u-flex u-row  center">
-			<view class="text_recommend " :style='objTextStyle'>
-				{{Number(dataContent.qty)}}
-			</view>
-			<uom :uom="dataContent.uom"></uom>
-		</view>
-		<view>
-			<pack-unit :dataContent="dataContent"></pack-unit>
-		</view>
-	</view>
+    <view class="u-flex u-row center">
+      <view class="text_recommend">
+        {{ Number(dataContent.qty) }}
+      </view>
+      <uom :uom="dataContent.uom"></uom>
+      <view v-if="dataContent.packQty != undefined" class="uni-flex uni-row">
+        <view class="uom">/</view>
+        <view class="text_packQty">{{ calc(dataContent.qty, dataContent.packQty) }} </view>
+      </view>
+    </view>
+    <view>
+      <pack-unit :dataContent="dataContent"></pack-unit>
+    </view>
+  </view>
 </template>
 
-<script setup lang="ts">		
-	import packUnit from '@/mycomponents/qty/packUnit.vue'
-	import uom from '@/mycomponents/qty/uom.vue'
-	import status from '@/mycomponents/status/status.vue'
-	const props = defineProps({
-		type: {
-			type: String,
-			default: 'default' //recommend:推荐 compare:对比 
-		},
-		
-		dataContent: {
-			type: Object,
-			default: {}
-		},
-		recommendQty: {
-			type: Number,
-			default: 0
-		},
-		
-		handleQty: {
-			type: Number,
-			default: 0
-		},
-		
-		isShowStatus: {
-			type: Boolean,
-			default: true
-		},
-		isShowStdPack: {
-			type: Boolean,
-			default: true
-		},
-		objTextStyle:{
-			type: Object,
-			default: null
-		}
-	})
+<script setup lang="ts">
+import packUnit from '@/mycomponents/qty/packUnit.vue'
+import uom from '@/mycomponents/qty/uom.vue'
+import status from '@/mycomponents/status/status.vue'
 
+const props = defineProps({
+  type: {
+    type: String,
+    default: 'default' // recommend:推荐 compare:对比
+  },
+
+  dataContent: {
+    type: Object,
+    default: {}
+  },
+  recommendQty: {
+    type: Number,
+    default: 0
+  },
+
+  handleQty: {
+    type: Number,
+    default: 0
+  },
+
+  isShowStatus: {
+    type: Boolean,
+    default: true
+  },
+  isShowStdPack: {
+    type: Boolean,
+    default: true
+  },
+  objTextStyle: {
+    type: Object,
+    default: null
+  }
+})
+const calc = (qty, packQty) => {
+  return Math.ceil(Number(qty) / Number(packQty))
+}
 </script>
 
-<style lang="scss">
-</style>
\ No newline at end of file
+<style lang="scss"></style>
diff --git a/src/pages/fg/coms/comReceiptPopup.vue b/src/pages/fg/coms/comReceiptPopup.vue
index f6324b35..32778411 100644
--- a/src/pages/fg/coms/comReceiptPopup.vue
+++ b/src/pages/fg/coms/comReceiptPopup.vue
@@ -17,13 +17,12 @@
                 <view class="customerBorder" @click="showSelectLine">
                   {{ productionLineName }}
                 </view>
-                <u-select v-model="showProductLineSelect" mode="single-column" :list="productLineList" @confirm="confirmSelectLine"></u-select>
+                <u-select v-model="showProductLineSelect" mode="mutil-column-auto" :list="productLineList" @confirm="confirmSelectLine"></u-select>
 
                 <view class="">
                   <image src="/static/icons/down.svg" mode="" style="width: 40rpx; height: 40rpx; margin-left: 20rpx" @click="showSelectLine"> </image>
                 </view>
               </view>
-
               <view class="split_line"></view>
 
               <view class="title" style="display: flex; align-items: center; padding: 10rpx">
@@ -31,6 +30,7 @@
                 <view class="customerBorder">
                   {{ itemCode }}
                 </view>
+                <view v-if="planQty > 0">{{ planQty }}({{ getUomInfo(uom) }})</view>
                 <u-select v-model="showItemCodeSelect" mode="single-column" :list="itemCodeList" @confirm="confirmSelectItem"></u-select>
                 <view class="">
                   <image src="/static/icons/down.svg" mode="" style="width: 40rpx; height: 40rpx; margin-left: 20rpx" @click="showSelectItemCode"> </image>
@@ -46,22 +46,23 @@
                 </view>
               </view>
               <view class="split_line"></view>
-              <view class="title" style="display: flex; align-items: center; padding: 10rpx">
-                <text style="flex-shrink: 0; width: 25%">计划数量：</text>
-                <view class="customerBorder">
-                  {{ planQty }}
-                </view>
-                <view class="">
-                  <image src="" mode="" style="width: 40rpx; height: 40rpx; margin-left: 20rpx"> </image>
-                </view>
-              </view>
+              <!-- <view class="title " style="display: flex;align-items: center;padding: 10rpx;">
+								<text style=" flex-shrink: 0; width: 25%;">计划数量：</text>
+								<view class="customerBorder">
+									{{planQty}}
+								</view>
+								<view class="">
+									<image src="" mode="" style=" width: 40rpx;height: 40rpx;margin-left: 20rpx;">
+									</image>
+								</view>
+							</view> -->
               <view class="split_line"></view>
               <view class="title" style="display: flex; align-items: center; padding: 10rpx">
                 <text style="flex-shrink: 0; width: 25%">包装规格：</text>
                 <view class="customerBorder">
                   {{ packUnit }}
                 </view>
-                <u-select v-model="showPackUnitSelect" mode="mutil-column-auto" :list="packUnitList" @confirm="confirmSelectPackUnit"></u-select>
+                <u-select v-model="showPackUnitSelect" mode="mutil-column" :list="packUnitList" @confirm="confirmSelectPackUnit"></u-select>
                 <view class="">
                   <image src="/static/icons/down.svg" mode="" style="width: 40rpx; height: 40rpx; margin-left: 20rpx" @click="showSelectPackUnit"> </image>
                 </view>
@@ -82,7 +83,7 @@
 </template>
 
 <script>
-import { getIssueJobByProductionline, getPlaneInfoByproductLine, getPackUnitByItemCode } from '@/api/request2.js'
+import { getIssueJobByProductionline, getPlaneInfoByproductLine, getPackUnitByItemCode, getProductionlineAndWorkStation } from '@/api/request2.js'
 import { getPackUnitName, getUomInfo } from '@/common/directory.js'
 
 import { getCurrDate, getBatch8 } from '@/common/basic.js'
@@ -115,36 +116,7 @@ export default {
       showPackUnitSelect: false,
       itemCodeList: [],
       showItemCodeSelect: false,
-      packUnitList: [
-        {
-          value: 1,
-          label: '中国',
-          children: [
-            {
-              value: 2,
-              label: '广东'
-            },
-            {
-              value: 5,
-              label: '广西'
-            }
-          ]
-        },
-        {
-          value: 8,
-          label: '美国',
-          children: [
-            {
-              value: 9,
-              label: '纽约'
-            },
-            {
-              value: 10,
-              label: '华盛顿'
-            }
-          ]
-        }
-      ]
+      packUnitList: []
     }
   },
   props: {
@@ -247,13 +219,13 @@ export default {
           title: '加载中',
           mask: true
         })
-        getIssueJobByProductionline()
+        getProductionlineAndWorkStation()
           .then((res) => {
             uni.hideLoading()
             if (res.data && res.data.length > 0) {
-              res.data.forEach((item) => {
-                item.label = item.name
-              })
+              // res.data.forEach(item => {
+              // 	item.label = item.name
+              // })
               this.productLineList = res.data
               this.showProductLineSelect = true
             } else {
@@ -285,7 +257,8 @@ export default {
             uni.hideLoading()
             if (res.data && res.data.length > 0) {
               res.data.forEach((item) => {
-                item.label = item.itemCode
+                item.label = `${item.itemCode}（${item.planQty}${item.uom})`
+                item.value = item
               })
               this.itemCodeList = res.data
               this.showItemCodeSelect = true
@@ -302,11 +275,17 @@ export default {
       }
     },
     confirmSelectItem(data) {
-      this.itemCode = data[0].label
-      const item = this.itemCodeList.find((res) => res.itemCode == this.itemCode)
-      this.uom = item.uom
-      this.planQty = item.planQty
-      this.number = item.number
+      const productionPlan = data[0].value
+      this.itemCode = productionPlan.itemCode
+      // var item = this.itemCodeList.find(res => res.itemCode == this.itemCode)
+      this.uom = productionPlan.uom
+      this.planQty = productionPlan.planQty
+      this.number = productionPlan.number
+      // this.itemCode = data[0].label
+      // var item = this.itemCodeList.find(res => res.itemCode == this.itemCode)
+      // this.uom = item.uom
+      // this.planQty = item.planQty
+      // this.number = item.number
     },
 
     showSelectPackUnit() {
diff --git a/src/uni_modules/vk-uview-ui/components/u-select/u-select.vue b/src/uni_modules/vk-uview-ui/components/u-select/u-select.vue
index ac655b94..c3039f42 100644
--- a/src/uni_modules/vk-uview-ui/components/u-select/u-select.vue
+++ b/src/uni_modules/vk-uview-ui/components/u-select/u-select.vue
@@ -1,6 +1,6 @@
 <template>
-	<view class="u-select">
-		<!-- <view class="u-select__action" :class="{
+  <view class="u-select">
+    <!-- <view class="u-select__action" :class="{
 			'u-select--border': border
 		}" @tap.stop="selectHandler">
 			<view class="u-select__action__icon" :class="{
@@ -9,429 +9,414 @@
 				<u-icon name="arrow-down-fill" size="26" color="#c0c4cc"></u-icon>
 			</view>
 		</view> -->
-		<u-popup :blur="blur" :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="popupValue" length="auto" :safeAreaInsetBottom="safeAreaInsetBottom" @close="close" :z-index="uZIndex">
-			<view class="u-select">
-				<view class="u-select__header" @touchmove.stop.prevent="">
-					<view
-						class="u-select__header__cancel u-select__header__btn"
-						:style="{ color: cancelColor }"
-						hover-class="u-hover-class"
-						:hover-stay-time="150"
-						@tap.stop="getResult('cancel')"
-					>
-						{{cancelText}}
-					</view>
-					<view class="u-select__header__title">
-						{{title}}
-					</view>
-					<view
-						class="u-select__header__confirm u-select__header__btn"
-						:style="{ color: moving ? cancelColor : confirmColor }"
-						hover-class="u-hover-class"
-						:hover-stay-time="150"
-						@touchmove.stop=""
-						@tap.stop="getResult('confirm')"
-					>
-						{{confirmText}}
-					</view>
-				</view>
-				<view class="u-select__body">
-					<picker-view @change="columnChange" class="u-select__body__picker-view" :value="defaultSelector" @pickstart="pickstart" @pickend="pickend">
-						<picker-view-column v-for="(item, index) in columnData" :key="index">
-							<view class="u-select__body__picker-view__item" v-for="(item1, index1) in item" :key="index1">
-								<view class="u-line-1">{{ item1[labelName] }}</view>
-							</view>
-						</picker-view-column>
-					</picker-view>
-				</view>
-			</view>
-		</u-popup>
-	</view>
+    <u-popup :blur="blur" :maskCloseAble="maskCloseAble" mode="bottom" :popup="false" v-model="popupValue" length="auto" :safeAreaInsetBottom="safeAreaInsetBottom" @close="close" :z-index="uZIndex">
+      <view class="u-select">
+        <view class="u-select__header" @touchmove.stop.prevent="">
+          <view class="u-select__header__cancel u-select__header__btn" :style="{ color: cancelColor }" hover-class="u-hover-class" :hover-stay-time="150" @tap.stop="getResult('cancel')">
+            {{ cancelText }}
+          </view>
+          <view class="u-select__header__title">
+            {{ title }}
+          </view>
+          <view class="u-select__header__confirm u-select__header__btn" :style="{ color: moving ? cancelColor : confirmColor }" hover-class="u-hover-class" :hover-stay-time="150" @touchmove.stop="" @tap.stop="getResult('confirm')">
+            {{ confirmText }}
+          </view>
+        </view>
+        <view class="u-select__body">
+          <picker-view @change="columnChange" class="u-select__body__picker-view" :value="defaultSelector" @pickstart="pickstart" @pickend="pickend">
+            <picker-view-column v-for="(item, index) in columnData" :key="index">
+              <view class="u-select__body__picker-view__item" v-for="(item1, index1) in item" :key="index1">
+                <view class="u-line-1">{{ item1[labelName] }}</view>
+              </view>
+            </picker-view-column>
+          </picker-view>
+        </view>
+      </view>
+    </u-popup>
+  </view>
 </template>
 
 <script>
-	/**
-	 * select 列选择器
-	 * @description 此选择器用于单列，多列，多列联动的选择场景。(从1.3.0版本起，不建议使用Picker组件的单列和多列模式，Select组件是专门为列选择而构造的组件，更简单易用。)
-	 * @tutorial http://uviewui.com/components/select.html
-	 * @property {String} mode 模式选择，"single-column"-单列模式，"mutil-column"-多列模式，"mutil-column-auto"-多列联动模式
-	 * @property {Array} list 列数据，数组形式，见官网说明
-	 * @property {Boolean} v-model 布尔值变量，用于控制选择器的弹出与收起
-	 * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配(默认false)
-	 * @property {String} cancel-color 取消按钮的颜色（默认#606266）
-	 * @property {String} confirm-color 确认按钮的颜色(默认#2979ff)
-	 * @property {String} confirm-text 确认按钮的文字
-	 * @property {String} cancel-text 取消按钮的文字
-	 * @property {String} default-value 提供的默认选中的下标，见官网说明
-	 * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭Picker(默认true)
-	 * @property {String Number} z-index 弹出时的z-index值(默认10075)
-	 * @property {String} value-name 自定义list数据的value属性名 1.3.6
-	 * @property {String} label-name 自定义list数据的label属性名 1.3.6
-	 * @property {String} child-name 自定义list数据的children属性名，只对多列联动模式有效 1.3.7
-	 * @event {Function} confirm 点击确定按钮，返回当前选择的值
-	 * @example <u-select v-model="show" :list="list"></u-select>
-	 */
+/**
+ * select 列选择器
+ * @description 此选择器用于单列，多列，多列联动的选择场景。(从1.3.0版本起，不建议使用Picker组件的单列和多列模式，Select组件是专门为列选择而构造的组件，更简单易用。)
+ * @tutorial http://uviewui.com/components/select.html
+ * @property {String} mode 模式选择，"single-column"-单列模式，"mutil-column"-多列模式，"mutil-column-auto"-多列联动模式
+ * @property {Array} list 列数据，数组形式，见官网说明
+ * @property {Boolean} v-model 布尔值变量，用于控制选择器的弹出与收起
+ * @property {Boolean} safe-area-inset-bottom 是否开启底部安全区适配(默认false)
+ * @property {String} cancel-color 取消按钮的颜色（默认#606266）
+ * @property {String} confirm-color 确认按钮的颜色(默认#2979ff)
+ * @property {String} confirm-text 确认按钮的文字
+ * @property {String} cancel-text 取消按钮的文字
+ * @property {String} default-value 提供的默认选中的下标，见官网说明
+ * @property {Boolean} mask-close-able 是否允许通过点击遮罩关闭Picker(默认true)
+ * @property {String Number} z-index 弹出时的z-index值(默认10075)
+ * @property {String} value-name 自定义list数据的value属性名 1.3.6
+ * @property {String} label-name 自定义list数据的label属性名 1.3.6
+ * @property {String} child-name 自定义list数据的children属性名，只对多列联动模式有效 1.3.7
+ * @event {Function} confirm 点击确定按钮，返回当前选择的值
+ * @example <u-select v-model="show" :list="list"></u-select>
+ */
 
 export default {
-  emits: ["update:modelValue", "input", "confirm","cancel"],
-	props: {
+  emits: ['update:modelValue', 'input', 'confirm', 'cancel'],
+  props: {
     // 通过双向绑定控制组件的弹出与收起
     value: {
-    	type: Boolean,
-    	default: false
+      type: Boolean,
+      default: false
     },
     modelValue: {
       type: Boolean,
       default: false
     },
-		// 列数据
-		list: {
-			type: Array,
-			default() {
-				return [];
-			}
-		},
-		// 是否显示边框
-		border: {
-			type: Boolean,
-			default: true
-		},
-		// "取消"按钮的颜色
-		cancelColor: {
-			type: String,
-			default: '#606266'
-		},
-		// "确定"按钮的颜色
-		confirmColor: {
-			type: String,
-			default: '#2979ff'
-		},
-		// 弹出的z-index值
-		zIndex: {
-			type: [String, Number],
-			default: 0
-		},
-		safeAreaInsetBottom: {
-			type: Boolean,
-			default: false
-		},
-		// 是否允许通过点击遮罩关闭Picker
-		maskCloseAble: {
-			type: Boolean,
-			default: true
-		},
-		// 提供的默认选中的下标
-		defaultValue: {
-			type: Array,
-			default() {
-				return [0];
-			}
-		},
-		// 模式选择，single-column-单列，mutil-column-多列，mutil-column-auto-多列联动
-		mode: {
-			type: String,
-			default: 'single-column'
-		},
-		// 自定义value属性名
-		valueName: {
-			type: String,
-			default: 'value'
-		},
-		// 自定义label属性名
-		labelName: {
-			type: String,
-			default: 'label'
-		},
-		// 自定义多列联动模式的children属性名
-		childName: {
-			type: String,
-			default: 'children'
-		},
-		// 顶部标题
-		title: {
-			type: String,
-			default: ''
-		},
-		// 取消按钮的文字
-		cancelText: {
-			type: String,
-			default: '取消'
-		},
-		// 确认按钮的文字
-		confirmText: {
-			type: String,
-			default: '确认'
-		},
-		// 遮罩的模糊度
-		blur: {
-			type: [Number, String],
-			default: 0
-		},
-	},
-	data() {
-		return {
+    // 列数据
+    list: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    // 是否显示边框
+    border: {
+      type: Boolean,
+      default: true
+    },
+    // "取消"按钮的颜色
+    cancelColor: {
+      type: String,
+      default: '#606266'
+    },
+    // "确定"按钮的颜色
+    confirmColor: {
+      type: String,
+      default: '#2979ff'
+    },
+    // 弹出的z-index值
+    zIndex: {
+      type: [String, Number],
+      default: 0
+    },
+    safeAreaInsetBottom: {
+      type: Boolean,
+      default: false
+    },
+    // 是否允许通过点击遮罩关闭Picker
+    maskCloseAble: {
+      type: Boolean,
+      default: true
+    },
+    // 提供的默认选中的下标
+    defaultValue: {
+      type: Array,
+      default() {
+        return [0]
+      }
+    },
+    // 模式选择，single-column-单列，mutil-column-多列，mutil-column-auto-多列联动
+    mode: {
+      type: String,
+      default: 'single-column'
+    },
+    // 自定义value属性名
+    valueName: {
+      type: String,
+      default: 'value'
+    },
+    // 自定义label属性名
+    labelName: {
+      type: String,
+      default: 'label'
+    },
+    // 自定义多列联动模式的children属性名
+    childName: {
+      type: String,
+      default: 'children'
+    },
+    // 顶部标题
+    title: {
+      type: String,
+      default: ''
+    },
+    // 取消按钮的文字
+    cancelText: {
+      type: String,
+      default: '取消'
+    },
+    // 确认按钮的文字
+    confirmText: {
+      type: String,
+      default: '确认'
+    },
+    // 遮罩的模糊度
+    blur: {
+      type: [Number, String],
+      default: 0
+    }
+  },
+  data() {
+    return {
       popupValue: false,
-			// 用于列改变时，保存当前的索引，下一次变化时比较得出是哪一列发生了变化
-			defaultSelector: [0],
-			// picker-view的数据
-			columnData: [],
-			// 每次队列发生变化时，保存选择的结果
-			selectValue: [],
-			// 上一次列变化时的index
-			lastSelectIndex: [],
-			// 列数
-			columnNum: 0,
-			// 列是否还在滑动中，微信小程序如果在滑动中就点确定，结果可能不准确
-			moving: false
-		};
-	},
-	watch: {
-		// 在select弹起的时候，重新初始化所有数据
-		value: {
-			immediate: true,
-			handler(val) {
-				if(val) setTimeout(() => this.init(), 10);
-        this.popupValue = val;
-			}
-		},
+      // 用于列改变时，保存当前的索引，下一次变化时比较得出是哪一列发生了变化
+      defaultSelector: [0],
+      // picker-view的数据
+      columnData: [],
+      // 每次队列发生变化时，保存选择的结果
+      selectValue: [],
+      // 上一次列变化时的index
+      lastSelectIndex: [],
+      // 列数
+      columnNum: 0,
+      // 列是否还在滑动中，微信小程序如果在滑动中就点确定，结果可能不准确
+      moving: false
+    }
+  },
+  watch: {
+    // 在select弹起的时候，重新初始化所有数据
+    value: {
+      immediate: true,
+      handler(val) {
+        if (val) setTimeout(() => this.init(), 10)
+        this.popupValue = val
+      }
+    },
     modelValue: {
-    	immediate: true,
-    	handler(val) {
-    		if(val) setTimeout(() => this.init(), 10);
-        this.popupValue = val;
-    	}
+      immediate: true,
+      handler(val) {
+        if (val) setTimeout(() => this.init(), 10)
+        this.popupValue = val
+      }
+    }
+  },
+  computed: {
+    uZIndex() {
+      // 如果用户有传递z-index值，优先使用
+      return this.zIndex ? this.zIndex : this.$u.zIndex.popup
+    }
+  },
+  methods: {
+    // 标识滑动开始，只有微信小程序才有这样的事件
+    pickstart() {
+      // #ifdef MP-WEIXIN
+      this.moving = true
+      // #endif
     },
-	},
-	computed: {
-		uZIndex() {
-			// 如果用户有传递z-index值，优先使用
-			return this.zIndex ? this.zIndex : this.$u.zIndex.popup;
-		},
-	},
-	methods: {
-		// 标识滑动开始，只有微信小程序才有这样的事件
-		pickstart() {
-			// #ifdef MP-WEIXIN
-			this.moving = true;
-			// #endif
-		},
-		// 标识滑动结束
-		pickend() {
-			// #ifdef MP-WEIXIN
-			this.moving = false;
-			// #endif
-		},
-		init() {
-			this.setColumnNum();
-			this.setDefaultSelector();
-			this.setColumnData();
-			this.setSelectValue();
-		},
-		// 获取默认选中列下标
-		setDefaultSelector() {
-			// 如果没有传入默认选中的值，生成长度为columnNum，用0填充的数组
-			this.defaultSelector = this.defaultValue.length == this.columnNum ? this.defaultValue : Array(this.columnNum).fill(0);
-			this.lastSelectIndex = this.$u.deepClone(this.defaultSelector);
-		},
-		// 计算列数
-		setColumnNum() {
-			// 单列的列数为1
-			if(this.mode == 'single-column') this.columnNum = 1;
-			// 多列时，this.list数组长度就是列数
-			else if(this.mode == 'mutil-column') this.columnNum = this.list.length;
-			// 多列联动时，通过历遍this.list的第一个元素，得出有多少列
-			else if(this.mode == 'mutil-column-auto') {
-				let num = 1;
-				let column = this.list;
-				// 只要有元素并且第一个元素有children属性，继续历遍
-				while(column[0][this.childName]) {
-					column = column[0] ? column[0][this.childName] : {};
-					num ++;
-				}
-				this.columnNum = num;
-			}
-		},
-		// 获取需要展示在picker中的列数据
-		setColumnData() {
-			let data = [];
-			this.selectValue = [];
-			if(this.mode == 'mutil-column-auto') {
-				// 获得所有数据中的第一个元素
-				let column = this.list[this.defaultSelector.length ? this.defaultSelector[0] : 0];
-				// 通过循环所有的列数，再根据设定列的数组，得出当前需要渲染的整个列数组
-				for (let i = 0; i < this.columnNum; i++) {
-					// 第一列默认为整个list数组
-					if (i == 0) {
-						data[i] = this.list;
-						column = column[this.childName];
-					} else {
-						// 大于第一列时，判断是否有默认选中的，如果没有就用该列的第一项
-						data[i] = column;
-						column = column[this.defaultSelector[i]][this.childName];
-					}
-				}
-			} else if(this.mode == 'single-column') {
-				data[0] = this.list;
-			} else {
-				data = this.list;
-			}
-			this.columnData = data;
-		},
-		// 获取默认选中的值，如果没有设置defaultValue，就默认选中每列的第一个
-		setSelectValue() {
-			let tmp = null;
-			for(let i = 0; i < this.columnNum; i++) {
-				tmp = this.columnData[i][this.defaultSelector[i]];
-				let data = {
-					value: tmp ? tmp[this.valueName] : null,
-					label: tmp ? tmp[this.labelName] : null
-				};
-				// 判断是否存在额外的参数，如果存在，就返回
-				if(tmp && tmp.extra) data.extra = tmp.extra;
-				this.selectValue.push(data)
-			}
-		},
-		// 列选项
-		columnChange(e) {
-			let index = null;
-			let columnIndex = e.detail.value;
-			// 由于后面是需要push进数组的，所以需要先清空数组
-			this.selectValue = [];
-			if(this.mode == 'mutil-column-auto') {
-				// 对比前后两个数组，寻找变更的是哪一列，如果某一个元素不同，即可判定该列发生了变化
-				this.lastSelectIndex.map((val, idx) => {
-					if (val != columnIndex[idx]) index = idx;
-				});
-				this.defaultSelector = columnIndex;
-				for (let i = index + 1; i < this.columnNum; i++) {
-					// 当前变化列的下一列的数据，需要获取上一列的数据，同时需要指定是上一列的第几个的children，再往后的
-					// 默认是队列的第一个为默认选项
-					this.columnData[i] = this.columnData[i - 1][i - 1 == index ? columnIndex[index] : 0][this.childName];
-					// 改变的列之后的所有列，默认选中第一个
-					this.defaultSelector[i] = 0;
-				}
-				// 在历遍的过程中，可能由于上一步修改this.columnData，导致产生连锁反应，程序触发columnChange，会有多次调用
-				// 只有在最后一次数据稳定后的结果是正确的，此前的历遍中，可能会产生undefined，故需要判断
-				columnIndex.map((item, index) => {
-					let data = this.columnData[index][columnIndex[index]];
-					let tmp = {
-						value: data ? data[this.valueName] : null,
-						label: data ? data[this.labelName] : null,
-					};
-					// 判断是否有需要额外携带的参数
-					if(data && data.extra !== undefined) tmp.extra = data.extra;
-					this.selectValue.push(tmp);
-
-				})
-				// 保存这一次的结果，用于下次列发生变化时作比较
-				this.lastSelectIndex = columnIndex;
-			} else if(this.mode == 'single-column') {
-				let data = this.columnData[0][columnIndex[0]];
-				// 初始默认选中值
-				let tmp = {
-					value: data ? data[this.valueName] : null,
-					label: data ? data[this.labelName] : null,
-				};
-				// 判断是否有需要额外携带的参数
-				if(data && data.extra !== undefined) tmp.extra = data.extra;
-				this.selectValue.push(tmp);
-			} else if(this.mode == 'mutil-column') {
-				// 初始默认选中值
-				columnIndex.map((item, index) => {
-					let data = this.columnData[index][columnIndex[index]];
-					// 初始默认选中值
-					let tmp = {
-						value: data ? data[this.valueName] : null,
-						label: data ? data[this.labelName] : null,
-					};
-					// 判断是否有需要额外携带的参数
-					if(data && data.extra !== undefined) tmp.extra = data.extra;
-					this.selectValue.push(tmp);
-				})
-			}
-		},
-		close() {
-			this.$emit('input', false);
-      this.$emit("update:modelValue", false);
-		},
-		// 点击确定或者取消
-		getResult(event = null) {
-			// #ifdef MP-WEIXIN
-			if (this.moving) return;
-			// #endif
-			if (event) this.$emit(event, this.selectValue);
-			this.close();
-		},
-		selectHandler() {
-			this.$emit('click');
-		}
-	}
-};
+    // 标识滑动结束
+    pickend() {
+      // #ifdef MP-WEIXIN
+      this.moving = false
+      // #endif
+    },
+    init() {
+      this.setColumnNum()
+      this.setDefaultSelector()
+      this.setColumnData()
+      this.setSelectValue()
+    },
+    // 获取默认选中列下标
+    setDefaultSelector() {
+      // 如果没有传入默认选中的值，生成长度为columnNum，用0填充的数组
+      this.defaultSelector = this.defaultValue.length == this.columnNum ? this.defaultValue : Array(this.columnNum).fill(0)
+      this.lastSelectIndex = this.$u.deepClone(this.defaultSelector)
+    },
+    // 计算列数
+    setColumnNum() {
+      // 单列的列数为1
+      if (this.mode == 'single-column') this.columnNum = 1
+      // 多列时，this.list数组长度就是列数
+      else if (this.mode == 'mutil-column') this.columnNum = this.list.length
+      // 多列联动时，通过历遍this.list的第一个元素，得出有多少列
+      else if (this.mode == 'mutil-column-auto') {
+        let num = 1
+        let column = this.list
+        // 只要有元素并且第一个元素有children属性，继续历遍
+        while (column[0][this.childName]) {
+          column = column[0] ? column[0][this.childName] : {}
+          num++
+        }
+        this.columnNum = num
+      }
+    },
+    // 获取需要展示在picker中的列数据
+    setColumnData() {
+      let data = []
+      this.selectValue = []
+      if (this.mode == 'mutil-column-auto') {
+        // 获得所有数据中的第一个元素
+        let column = this.list[this.defaultSelector.length ? this.defaultSelector[0] : 0]
+        // 通过循环所有的列数，再根据设定列的数组，得出当前需要渲染的整个列数组
+        for (let i = 0; i < this.columnNum; i++) {
+          // 第一列默认为整个list数组
+          if (i == 0) {
+            data[i] = this.list
+            column = column[this.childName]
+          } else {
+            // 大于第一列时，判断是否有默认选中的，如果没有就用该列的第一项
+            data[i] = column
+            column = column[this.defaultSelector[i]][this.childName]
+          }
+        }
+      } else if (this.mode == 'single-column') {
+        data[0] = this.list
+      } else {
+        data = this.list
+      }
+      this.columnData = data
+    },
+    // 获取默认选中的值，如果没有设置defaultValue，就默认选中每列的第一个
+    setSelectValue() {
+      let tmp = null
+      for (let i = 0; i < this.columnNum; i++) {
+        tmp = this.columnData[i][this.defaultSelector[i]]
+        const data = {
+          value: tmp ? tmp[this.valueName] : null,
+          label: tmp ? tmp[this.labelName] : null
+        }
+        // 判断是否存在额外的参数，如果存在，就返回
+        if (tmp && tmp.extra) data.extra = tmp.extra
+        this.selectValue.push(data)
+      }
+    },
+    // 列选项
+    columnChange(e) {
+      let index = null
+      const columnIndex = e.detail.value
+      // 由于后面是需要push进数组的，所以需要先清空数组
+      this.selectValue = []
+      if (this.mode == 'mutil-column-auto') {
+        // 对比前后两个数组，寻找变更的是哪一列，如果某一个元素不同，即可判定该列发生了变化
+        this.lastSelectIndex.map((val, idx) => {
+          if (val != columnIndex[idx]) index = idx
+        })
+        this.defaultSelector = columnIndex
+        for (let i = index + 1; i < this.columnNum; i++) {
+          // 当前变化列的下一列的数据，需要获取上一列的数据，同时需要指定是上一列的第几个的children，再往后的
+          // 默认是队列的第一个为默认选项
+          this.columnData[i] = this.columnData[i - 1][i - 1 == index ? columnIndex[index] : 0][this.childName]
+          // 改变的列之后的所有列，默认选中第一个
+          this.defaultSelector[i] = 0
+        }
+        // 在历遍的过程中，可能由于上一步修改this.columnData，导致产生连锁反应，程序触发columnChange，会有多次调用
+        // 只有在最后一次数据稳定后的结果是正确的，此前的历遍中，可能会产生undefined，故需要判断
+        columnIndex.map((item, index) => {
+          const data = this.columnData[index][columnIndex[index]]
+          const tmp = {
+            value: data ? data[this.valueName] : null,
+            label: data ? data[this.labelName] : null
+          }
+          // 判断是否有需要额外携带的参数
+          if (data && data.extra !== undefined) tmp.extra = data.extra
+          this.selectValue.push(tmp)
+        })
+        // 保存这一次的结果，用于下次列发生变化时作比较
+        this.lastSelectIndex = columnIndex
+      } else if (this.mode == 'single-column') {
+        const data = this.columnData[0][columnIndex[0]]
+        // 初始默认选中值
+        const tmp = {
+          value: data ? data[this.valueName] : null,
+          label: data ? data[this.labelName] : null
+        }
+        // 判断是否有需要额外携带的参数
+        if (data && data.extra !== undefined) tmp.extra = data.extra
+        this.selectValue.push(tmp)
+      } else if (this.mode == 'mutil-column') {
+        // 初始默认选中值
+        columnIndex.map((item, index) => {
+          const data = this.columnData[index][columnIndex[index]]
+          // 初始默认选中值
+          const tmp = {
+            value: data ? data[this.valueName] : null,
+            label: data ? data[this.labelName] : null
+          }
+          // 判断是否有需要额外携带的参数
+          if (data && data.extra !== undefined) tmp.extra = data.extra
+          this.selectValue.push(tmp)
+        })
+      }
+    },
+    close() {
+      this.$emit('input', false)
+      this.$emit('update:modelValue', false)
+    },
+    // 点击确定或者取消
+    getResult(event = null) {
+      // #ifdef MP-WEIXIN
+      if (this.moving) return
+      // #endif
+      if (event) this.$emit(event, this.selectValue)
+      this.close()
+    },
+    selectHandler() {
+      this.$emit('click')
+    }
+  }
+}
 </script>
 
 <style scoped lang="scss">
-@import "../../libs/css/style.components.scss";
+@import '../../libs/css/style.components.scss';
 
 .u-select {
+  &__action {
+    position: relative;
+    line-height: $u-form-item-height;
+    height: $u-form-item-height;
 
-	&__action {
-		position: relative;
-		line-height: $u-form-item-height;
-		height: $u-form-item-height;
-
-		&__icon {
-			position: absolute;
-			right: 20rpx;
-			top: 50%;
-			transition: transform .4s;
-			transform: translateY(-50%);
-			z-index: 1;
+    &__icon {
+      position: absolute;
+      right: 20rpx;
+      top: 50%;
+      transition: transform 0.4s;
+      transform: translateY(-50%);
+      z-index: 1;
 
-			&--reverse {
-				transform: rotate(-180deg) translateY(50%);
-			}
-		}
-	}
+      &--reverse {
+        transform: rotate(-180deg) translateY(50%);
+      }
+    }
+  }
 
-	&__hader {
-		&__title {
-			color: $u-content-color;
-		}
-	}
+  &__hader {
+    &__title {
+      color: $u-content-color;
+    }
+  }
 
-	&--border {
-		border-radius: 6rpx;
-		border-radius: 4px;
-		border: 1px solid $u-form-item-border-color;
-	}
+  &--border {
+    border-radius: 6rpx;
+    border-radius: 4px;
+    border: 1px solid $u-form-item-border-color;
+  }
 
-	&__header {
-		@include vue-flex;
-		align-items: center;
-		justify-content: space-between;
-		height: 80rpx;
-		padding: 0 40rpx;
-	}
+  &__header {
+    @include vue-flex;
+    align-items: center;
+    justify-content: space-between;
+    height: 80rpx;
+    padding: 0 40rpx;
+  }
 
-	&__body {
-		width: 100%;
-		height: 300rpx;
-		overflow: hidden;
-		background-color: #fff;
+  &__body {
+    width: 100%;
+    height: 500rpx;
+    overflow: hidden;
+    background-color: #fff;
 
-		&__picker-view {
-			height: 100%;
-			box-sizing: border-box;
+    &__picker-view {
+      height: 100%;
+      box-sizing: border-box;
 
-			&__item {
-				@include vue-flex;
-				align-items: center;
-				justify-content: center;
-				font-size: 32rpx;
-				color: $u-main-color;
-				padding: 0 8rpx;
-			}
-		}
-	}
+      &__item {
+        @include vue-flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 32rpx;
+        color: $u-main-color;
+        padding: 0 8rpx;
+      }
+    }
+  }
 }
 </style>