lilei 8 hónapja
szülő
commit
b57da1f1ab

+ 6 - 3
components/select/v-select.vue

@@ -1,8 +1,7 @@
 <template>
 	<picker @change="toChange" :value="index" :range="datalist" range-key="dispName">
 		<view style="display: flex;align-items: center;">
-			<input class="form-input" :disabled="disabled" style="width: 100%;" v-model="selected" placeholder-style="color:#C0C4CC" :placeholder="getPlaceholderText" />
-			<u-icon name="arrow-right" color="#C0C4CC" ></u-icon>
+			<u-input class="form-input" type="select" style="width: 100%;" :input-align="inputAlign" v-model="selected" :placeholder="getPlaceholderText" />
 		</view>
 	</picker>
 </template>
@@ -38,7 +37,11 @@ export default {
       type: String,
       default: ''
     },
-    size: [String]
+    size: [String],
+	inputAlign:{
+		type: String,
+		default: 'left'
+	}
   },
   computed: {
     getVal () {

+ 1 - 1
config/index.js

@@ -6,7 +6,7 @@ const getConfig = (theme) => {
 			themePath: 'default',
 			pro_URL: 'https://iscm.360arrow.com/qpls-md/', // 生产地址
 			uat_URL: 'https://p.iscm.360arrow.com/qpls-md/', // 预发布地址
-			dev_URL: 'http://192.168.2.124/qpls-md/', // 本地地址
+			dev_URL: 'http://192.168.2.100:88/qpls-md/', // 本地地址
 			appName: 'iSCM智慧供应链', // app 名称
 			company: '陕西山海高科信息技术有限公司',
 			loadText:{

+ 1 - 1
pages/approveStore/authPass.vue

@@ -30,7 +30,7 @@
 					<u-input v-model="form.storeName" :maxlength="30" placeholder="请输入门店名称(最多30个字符)"/>
 				</u-form-item>
 				<u-form-item label="所在地区" required prop="label">
-					<u-input v-model="form.label" placeholder="请选择省市区" :disabled="true" @click="openAddress"/>
+					<u-input v-model="form.label" placeholder="请选择省市区" type="select" @click="openAddress"/>
 					<Address ref="applyAddress" :isJrMini="true" @onConfirm="areaConfirm"></Address>
 				</u-form-item>
 				<u-form-item label="详细地址" required prop="addrDetail">

+ 5 - 8
pages/sales/addCustomer.vue

@@ -4,8 +4,7 @@
 			<u-form :model="form" ref="uForm" label-width="150rpx" :error-type="['toast']">
 				<u-form-item label="客户名称" required prop="customerName" ><u-input v-model.trim="form.customerName" placeholder="请输入客户名称(最多30个字符)" input-align="right" :maxlength="60"/></u-form-item>
 				<u-form-item label="客户地址" required prop="provinceSn">
-					<u-input v-model="areaInfo.label" :disabled="true" input-align="right" placeholder="请选择客户地址" @click="openAddress"/>
-					<u-icon name="arrow-right" color="#C0C4CC" slot="right"  @click="openAddress"></u-icon>
+					<u-input v-model="areaInfo.label" type="select" input-align="right" placeholder="请选择客户地址" @click="openAddress"/>
 				</u-form-item>
 				<u-form-item label="详细地址">
 					<u-input type="textarea" :auto-height="true" input-align="right" placeholder="请输入详细地址(最多60个字符)" :maxlength="60" v-model="form.customerAddr"/>
@@ -19,21 +18,19 @@
 				<u-form-item label="联系手机"><u-input v-model.trim="form.contactMobile" placeholder="请输入联系手机(最多11位字符)" input-align="right" :maxlength="11"/>
 				</u-form-item>
 				<u-form-item label="价格类型" required prop="priceType">
-					<v-select ref="priceType" :disabled="true" placeholder="请选择价格类型" @itemChange="chooseType" code="PRICE_TYPE" style="width: 100%"></v-select>
+					<v-select ref="priceType" placeholder="请选择价格类型" input-align="right" @itemChange="chooseType" code="PRICE_TYPE" style="width: 100%"></v-select>
 				</u-form-item>
 				<u-form-item label="收款方式" required prop="settleStyleSn">
-					<u-input v-model="settleStyleName" input-align="right" :disabled="true" placeholder="请选择收款方式" @click="showSettle=true"/>
-					<u-icon name="arrow-right" color="#C0C4CC" slot="right" @click="showSettle=true"></u-icon>
+					<u-input v-model="settleStyleName" type="select" input-align="right" placeholder="请选择收款方式" @click="showSettle=true"/>
 				</u-form-item>
 				<u-form-item label="客户传真">
 					<u-input v-model="form.fax" input-align="right" placeholder="请输入客户传真(最多30个字符)" :maxlength="30"/>
 				</u-form-item>
 				<u-form-item label="客户类型">
-					<u-input v-model="custTypeName" input-align="right" :disabled="true" placeholder="请选择客户类型" @click="showCust=true"/>
-					<u-icon name="arrow-right" color="#C0C4CC" slot="right" @click="showCust=true"></u-icon>
+					<u-input v-model="custTypeName" input-align="right" type="select" placeholder="请选择客户类型" @click="showCust=true"/>
 				</u-form-item>
 				<u-form-item label="配送方式" >
-					<v-select ref="dispatchType" :disabled="true" placeholder="请选择配送方式" @itemChange="choosedispatchType" code="DISPATCH_TYPE" style="width: 100%"></v-select>
+					<v-select ref="dispatchType" placeholder="请选择配送方式" input-align="right" @itemChange="choosedispatchType" code="DISPATCH_TYPE" style="width: 100%"></v-select>
 				</u-form-item>
 			</u-form>
 		</view>

+ 5 - 8
pages/sales/addSales.vue

@@ -10,8 +10,7 @@
 			<view class="content-form">
 				<u-form :model="form" ref="uForm"  label-width="180" :error-type="['toast']">
 					<u-form-item label="客户地址" required >
-						<u-input v-model="areaInfo.label" :disabled="true" input-align="right" placeholder="请选择客户地址" @click="openAddress"/>
-						<u-icon name="arrow-right" color="#C0C4CC" slot="right"  @click="openAddress"></u-icon>
+						<u-input v-model="areaInfo.label" type="select" input-align="right" placeholder="请选择客户地址" @click="openAddress"/>
 					</u-form-item>
 					<u-form-item label="详细地址">
 						<textarea :auto-height="true" input-align="right" placeholder="请输入详细地址(最多60个字符)" :maxlength="60" v-model="form.shippingAddress" class="receiveAddress" placeholder-style="color:#C0C4CC;font-size:28upx;"/>
@@ -25,11 +24,10 @@
 					<u-form-item label="联系手机"><u-input v-model.trim="form.contactMobile" placeholder="请输入联系手机(最多11位字符)" input-align="right" :maxlength="11"/>
 					</u-form-item>
 					<u-form-item label="价格类型" required >
-						<v-select ref="priceType" :disabled="true" placeholder="请选择价格类型" @itemChange="chooseType" code="PRICE_TYPE" style="width: 100%"></v-select>
+						<v-select ref="priceType" input-align="right" placeholder="请选择价格类型" @itemChange="chooseType" code="PRICE_TYPE" style="width: 100%"></v-select>
 					</u-form-item>
 					<u-form-item label="收款方式" required prop="settleStyleSn">
-						<u-input v-model="settleStyleName" input-align="right" :disabled="true" placeholder="请选择收款方式" @click="showSettle=true"/>
-						<u-icon name="arrow-right" color="#C0C4CC" slot="right"></u-icon>
+						<u-input v-model="settleStyleName" input-align="right" type="select" placeholder="请选择收款方式" @click="showSettle=true"/>
 					</u-form-item>
 					<u-form-item label="铺货出库" required v-if="itemId">
 						<view style="width: 100%;display:flex;justify-content: flex-end;">
@@ -44,11 +42,10 @@
 						</view>
 					</u-form-item>
 					<u-form-item label="配送方式" >
-						<v-select ref="dispatchType" :disabled="true" placeholder="请选择配送方式" @itemChange="choosedispatchType" code="DISPATCH_TYPE" style="width: 100%"></v-select>
+						<v-select ref="dispatchType" input-align="right" placeholder="请选择配送方式" @itemChange="choosedispatchType" code="DISPATCH_TYPE" style="width: 100%"></v-select>
 					</u-form-item>
 					<u-form-item label="业务员">
-						<u-input v-model="userName" input-align="right" :disabled="true" placeholder="请选择业务员"  @click="showUser=true"/>
-						<u-icon name="arrow-right" color="#C0C4CC" slot="right"  @click="showUser=true"></u-icon>
+						<u-input v-model="userName" input-align="right" type="select" placeholder="请选择业务员"  @click="showUser=true"/>
 					</u-form-item>
 					<u-form-item label="备注">
 						<textarea :auto-height="true" input-align="right" placeholder="请输入备注(最多100个字符)" :maxlength="100" v-model="form.remarks" class="receiveAddress" placeholder-style="color:#C0C4CC;font-size:28upx;"/>

+ 3 - 5
pages/sales/bill.vue

@@ -7,8 +7,7 @@
 					<text>客户名称</text>
 				</view>
 				<view class="list_r u-flex">
-					<u-input v-model="customerObj.customerName" @click="goChooseCustomer" disabled placeholder="请选择客户名称" />
-					<u-icon name="arrow-right" color="#999" size="30"></u-icon>
+					<u-input v-model="customerObj.customerName" @click="goChooseCustomer" type="select" placeholder="请选择客户名称" />
 				</view>
 			</view>
 			<view class="headerList u-flex">
@@ -18,8 +17,7 @@
 					<u-icon name="question-circle-fill" @click="tipShow = true" :color="wordColor" size="32"></u-icon>
 				</view>
 				<view class="list_r u-flex">
-					<u-input v-model="cycleName" @click="chooseCycleData" disabled placeholder="请选择对账日期" />
-					<u-icon name="arrow-right" color="#999" size="30"></u-icon>
+					<u-input v-model="cycleName" @click="chooseCycleData" type="select" placeholder="请选择对账日期" />
 				</view>
 			</view>
 			<view class="statistical u-flex">
@@ -70,7 +68,7 @@
 					</view>
 				</view>
 				<view class="flex align_center form-item-inp" style="padding: 0 30rpx;" v-if="curTab == 6">
-					<u-input clearable v-model="dateArray" disabled placeholder="请选择时间段" input-align="center" @click="showDate = true" />
+					<u-input clearable v-model="dateArray" @clear="dateArray==''" clearWarehouse placeholder="请选择时间段" input-align="center" @click="showDate = true" />
 				</view>
 				<view class="form-footer-btn">
 					<u-button class="handle-btn" shape="circle" size="medium" hover-class="none" @click="handleClean">重置</u-button>

+ 3 - 4
pages/sales/productSearch.vue

@@ -20,14 +20,13 @@
 					<u-input v-model.trim="form.productName" placeholder="请输入产品名称" input-align="right" />
 				</u-form-item>
 				<u-form-item label="产品品牌" prop="productBrandSn" class="form-item">
-					<u-input v-model="brandName" @click="brandModal=true" disabled placeholder="请选择产品品牌" input-align="right" />
+					<u-input v-model="brandName" @click="brandModal=true" @clear="brandClean" clearable type="select" placeholder="请选择产品品牌" input-align="right" />
 				</u-form-item>
 				<u-form-item label="产品分类" prop="productTypeSn" class="form-item">
-					<u-input v-model="productTypeNameArr" @click="showTypeModal=true" disabled placeholder="请选择产品分类" input-align="right" />
+					<u-input v-model="productTypeNameArr" @click="showTypeModal=true" @clear="typeClean" type="select" clearable placeholder="请选择产品分类" input-align="right" />
 				</u-form-item>
 				<u-form-item label="仓库" prop="warehouseSn" class="form-item">
-					<u-input v-model="warehouseName" @click="warehouseModal=true" disabled placeholder="请选择仓库" class="form-item-inp" input-align="right" />
-					<u-icon v-show="warehouseName.length != 0" name="close-circle-fill" color="#c8c0cc" size="32" class="close-circle" @click="clearWarehouse"></u-icon>
+					<u-input v-model="warehouseName" @click="warehouseModal=true" @clear="clearWarehouse" type="select" clearable placeholder="请选择仓库" class="form-item-inp" input-align="right" />
 				</u-form-item>
 				<u-form-item label="成本价">
 					<u-switch slot="right" v-model="form.cost"></u-switch>

+ 3 - 6
pages/sales/salesSearch.vue

@@ -3,8 +3,7 @@
 		<u-popup v-model="isShow" class="search-popup" mode="right" @close="isShow=false" length="85%">
 			<u-form class="form-content" :model="form" ref="uForm" label-width="150">
 				<u-form-item label="创建时间" prop="date" class="form-item">
-					<u-input clearable v-model="form.date" disabled placeholder="请选择创建时间区间" class="form-item-inp" @click="showDate=true" />
-					<u-icon v-show="form.date.length != 0" name="close-circle-fill" color="#c8c0cc" size="32" class="close-circle" @click="clearTime"></u-icon>
+					<u-input clearable v-model="form.date" type="select" placeholder="请选择创建时间区间" @click="showDate=true" @clear="clearTime" />
 				</u-form-item>
 				<u-form-item label="客户名称" prop="buyerNameCurrent" class="form-item">
 					<u-input v-model="form.buyerNameCurrent" :maxlength="30" placeholder="请输入客户名称" />
@@ -16,12 +15,10 @@
 					<u-input v-model="form.purchaseBillNo" :maxlength="30" placeholder="请输入采购单号" />
 				</u-form-item>
 				<u-form-item label="收款方式" prop="settleStyleSn" class="form-item">
-					<u-input v-model="settleStyleName" @click="settleStyleModal=true" disabled placeholder="请选择收款方式" class="form-item-inp" />
-					<u-icon v-show="settleStyleName.length != 0" name="close-circle-fill" color="#c8c0cc" size="32" class="close-circle" @click="clearSettleStyle"></u-icon>
+					<u-input clearable v-model="settleStyleName" @click="settleStyleModal=true" @clear="clearSettleStyle" type="select" placeholder="请选择收款方式"/>
 				</u-form-item>
 				<u-form-item label="单据来源" prop="settleStyleSn" class="form-item">
-					<u-input v-model="sourceTypeName" @click="sourceTypeModal=true" disabled placeholder="请选择单据来源" class="form-item-inp" />
-					<u-icon v-show="sourceTypeName.length != 0" name="close-circle-fill" color="#c8c0cc" size="32" class="close-circle" @click="clearSourceType"></u-icon>
+					<u-input clearable v-model="sourceTypeName" @click="sourceTypeModal=true" placeholder="请选择单据来源" type="select" @clear="clearSourceType" />
 				</u-form-item>
 			</u-form>
 			<view class="uni-list-btns">

+ 3 - 4
pages/sales/search.vue

@@ -5,11 +5,10 @@
 				<u-form-item label="产品编码"><u-input v-model.trim="form.code" placeholder="请输入产品编码" input-align="right" /></u-form-item>
 				<u-form-item label="原厂编码"><u-input v-model.trim="form.origCode" placeholder="请输入原厂编码" input-align="right" /></u-form-item>
 				<u-form-item label="产品名称"><u-input v-model.trim="form.name" placeholder="请输入产品名称" input-align="right" /></u-form-item>
-				<u-form-item label="产品品牌"><u-input v-model="brandName" @click="brandModal=true" disabled placeholder="请选择产品品牌" input-align="right" /></u-form-item>
-				<u-form-item label="产品分类"><u-input v-model="productTypeNameArr" @click="showTypeModal=true" disabled placeholder="请选择产品分类" input-align="right" /></u-form-item>
+				<u-form-item label="产品品牌"><u-input v-model="brandName" clearable @click="brandModal=true" @clear="brandClean" type="select" placeholder="请选择产品品牌" input-align="right" /></u-form-item>
+				<u-form-item label="产品分类"><u-input v-model="productTypeNameArr" clearable @click="showTypeModal=true"  @clear="typeClean" type="select" placeholder="请选择产品分类" input-align="right" /></u-form-item>
 				<u-form-item label="产品状态" class="form-item">
-					<u-input v-model="onlineFalgName" @click="onlineFalgModal=true" disabled placeholder="请选择产品状态" input-align="right" />
-					<u-icon v-show="onlineFalgName.length != 0" name="close-circle-fill" color="#c8c0cc" size="32" class="close-circle" @click="clearOnlineFlag"></u-icon>
+					<u-input clearable v-model="onlineFalgName" @click="onlineFalgModal=true" @clear="clearOnlineFlag" type="select" placeholder="请选择产品状态" input-align="right" />
 				</u-form-item>
 				<u-form-item label="包含未入库产品" label-width="300">
 					<view class="flex justify_end" style="width: 100%;"><u-switch v-model="form.putStockFlag"></u-switch></view>

+ 1 - 2
pages/sales/searchParts.vue

@@ -5,8 +5,7 @@
 				<u-form-item label="产品编码"><u-input v-model.trim="form.productCode" placeholder="请输入产品编码" input-align="right" /></u-form-item>
 				<u-form-item label="产品名称"><u-input v-model.trim="form.productName" placeholder="请输入产品名称" input-align="right" /></u-form-item>
 				<u-form-item label="上线状态" class="form-item">
-					<u-input v-model="onlineFalgName" @click="onlineFalgModal=true" disabled placeholder="请选择上线状态" input-align="right" />
-					<u-icon v-show="onlineFalgName.length != 0" name="close-circle-fill" color="#c8c0cc" size="32" class="close-circle" @click="clearOnlineFlag"></u-icon>
+					<u-input v-model="onlineFalgName" @click="onlineFalgModal=true" clearable @clear="clearOnlineFlag" type="select" placeholder="请选择上线状态" input-align="right" />
 				</u-form-item>
 				<u-form-item label="通用产品编码"><u-input v-model.trim="form.productCommonCode" placeholder="请输入通用产品编码" input-align="right" /></u-form-item>
 				<u-form-item label="通用产品名称"><u-input v-model.trim="form.productCommonName" placeholder="请输入通用产品名称" input-align="right" /></u-form-item>

+ 5 - 12
pages/shelfOrder/search.vue

@@ -1,10 +1,9 @@
 <template>
 	<view class="salesSearch-wrap">
-		<u-popup v-model="isShow" class="search-popup" closeable mode="right" @close="isShow=false" length="85%">
+		<u-popup v-model="isShow" class="search-popup" closeable mode="right" @close="isShow=false" length="80%">
 			<u-form class="form-content" :model="form" ref="uForm" label-width="150">
 				<u-form-item label="下单时间" prop="date" class="form-item">
-					<u-input clearable v-model="form.date" disabled placeholder="请选择下单时间区间" class="form-item-inp" @click="showDate=true" />
-					<u-icon v-show="form.date.length != 0" name="close-circle-fill" color="#c8c0cc" size="32" class="close-circle" @click="clearTime"></u-icon>
+					<u-input clearable v-model="form.date" type="select" placeholder="请选择下单时间区间" @click="showDate=true" @clear="clearTime" />
 				</u-form-item>
 				<u-form-item label="产品编码" prop="productCode" class="form-item">
 					<u-input v-model="form.productCode" :maxlength="30" placeholder="请输入产品编码" />
@@ -13,8 +12,7 @@
 					<u-input v-model="form.productName" :maxlength="30" placeholder="请输入产品名称" />
 				</u-form-item>
 				<u-form-item label="订单状态" prop="billState" class="form-item">
-					<u-input v-model="settleStyleName" @click="settleStyleModal=true" disabled placeholder="请选择订单状态" class="form-item-inp" />
-					<u-icon v-show="settleStyleName.length != 0" name="close-circle-fill" color="#c8c0cc" size="32" class="close-circle" @click="clearSettleStyle"></u-icon>
+					<u-input v-model="settleStyleName" type="select" clearable placeholder="请选择订单状态" @click="settleStyleModal=true"  @clear="clearSettleStyle" />
 				</u-form-item>
 			</u-form>
 			<view class="uni-list-btns">
@@ -165,19 +163,14 @@
 		.search-popup {
 			.form-content {
 				display: block;
-				margin-top: 50upx;
+				margin-top: 80upx;
 				padding: 0 20upx;
 				box-sizing: content-box;
-				.form-item-inp{
-					display: inline-block;
-					width: 88%;
-					vertical-align: top;
-				}
 			}
 			.uni-list-btns {
 				display: flex;
 				padding: 20upx;
-				margin-top: 200upx;
+				margin-top: 100upx;
 				.handle-btn {
 					font-size: 28upx;
 					margin: 0 30upx;

+ 2 - 3
pages/statistics/index.vue

@@ -98,9 +98,8 @@
 						<view :class="item.val==curTab?'active':'all'" v-for="item in placeTab" :key="item.val" @click="tabChange(item)">{{item.name}}</view>
 					</view>
 				</view>
-				<view class="flex align_center form-item-inp" style="padding: 0 30rpx;" v-if="curTab == 6">
-					<u-input clearable v-model="dateArray" disabled placeholder="请选择时间段" @click="showDate=true" />
-					<u-icon name="arrow-down" color="#999"></u-icon>
+				<view class="flex align_center" style="padding: 0 30rpx;" v-if="curTab == 6">
+					<u-input v-model="dateArray" type="select" :clearable="false" placeholder="请选择时间段" @click="showDate=true" />
 				</view>
 				<view class="form-footer-btn">
 					<u-button class="handle-btn" shape="circle" size="medium" hover-class="none" @click="handleClean">重置</u-button>

+ 2 - 2
pages/stock/index.vue

@@ -21,8 +21,8 @@
 				<u-form-item label="产品编码"><u-input v-model.trim="form.productCode" placeholder="请输入产品编码" input-align="right" /></u-form-item>
 				<u-form-item label="原厂编码"><u-input v-model.trim="form.productOrigCode" placeholder="请输入原厂编码" input-align="right" /></u-form-item>
 				<u-form-item label="产品名称"><u-input v-model.trim="form.productName" placeholder="请输入产品名称" input-align="right" /></u-form-item>
-				<u-form-item label="产品品牌"><u-input v-model="brandName" @click="brandModal=true" disabled placeholder="请选择产品品牌" input-align="right" /></u-form-item>
-				<u-form-item label="产品分类"><u-input v-model="productTypeNameArr" @click="showTypeModal=true" disabled placeholder="请选择产品分类" input-align="right" /></u-form-item>
+				<u-form-item label="产品品牌"><u-input v-model="brandName" @click="brandModal=true" clearable @clear="brandClean" type="select" placeholder="请选择产品品牌" input-align="right" /></u-form-item>
+				<u-form-item label="产品分类"><u-input v-model="productTypeNameArr" @click="showTypeModal=true" clearable @clear="typeClean" type="select" placeholder="请选择产品分类" input-align="right" /></u-form-item>
 				<u-form-item label="滞销天数">
 					<u-input type="number" :min="0" :max="999999" v-model.trim="form.minUnsalableDays" placeholder="起始天数" input-align="left" />
 					<text style="display: block;text-align: center;line-height: 32px;">至</text>

+ 1 - 2
pages/vinAnalyse/search.vue

@@ -3,8 +3,7 @@
 		<u-popup v-model="isShow"  @close="isShow=false" mode="right" length="85%" >
 			<u-form :model="form" ref="uForm" label-width="150" class="form-content">
 				<u-form-item label="扫描时间" prop="date" class="form-item">
-					<u-input clearable v-model="form.date" disabled placeholder="请选择扫描时间区间" class="form-item-inp" @click="showDate=true" />
-					<u-icon v-show="form.date.length != 0" name="close-circle-fill" color="#c8c0cc" size="32" class="close-circle" @click="clearTime"></u-icon>
+					<u-input clearable v-model="form.date" @clear="clearTime" type="select" placeholder="请选择扫描时间区间" class="form-item-inp" @click="showDate=true" />
 				</u-form-item>
 				<u-form-item label="VIN"><u-input v-model.trim="form.vinCode" placeholder="请输入VIN"/></u-form-item>
 				<u-form-item label="车辆品牌"><u-input v-model.trim="form.brandName" placeholder="请输入车辆品牌"/></u-form-item>