lilei 4 달 전
부모
커밋
967ad47e73

+ 8 - 5
pages/replenishmentManage/detail.vue

@@ -1,11 +1,14 @@
 <template>
 	<view class="replenishment-detail-wrap">
 		<u-navbar back-text="补货单详情" :border-bottom="false" :background="{backgroundColor: $config('primaryColor')}" back-icon-color="#fff" :back-text-style="{ color: '#fff' }">
-			<view slot='right' style="padding: 0 30upx;color: #ffffff;" @click="creatSalesOrder" 
-			v-if="pageType=='success'&&totalNums&&basicInfoData&&basicInfoData.shelfInfo.state!='WRITE_OFF'&&basicInfoData.shelfInfo.state!='SUSPEND'">
-				<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
-				<text style="margin-left: 6rpx;">生成销售单</text>
-			</view>
+			<template v-slot:right>
+				<view style="padding: 0 30upx;color: #ffffff;" 
+				@click="creatSalesOrder" 
+				v-if="pageType=='success'&&totalNums&&basicInfoData&&basicInfoData.shelfInfo.state!='WRITE_OFF'&&basicInfoData.shelfInfo.state!='SUSPEND'">
+					<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
+					<text style="margin-left: 6rpx;">生成销售单</text>
+				</view>
+			</template>
 		</u-navbar>
 		<view class="replenishment-detail-body" :style="`backgroundImage:linear-gradient(180deg, ${$config('primaryColor')}, #F5F6F7 12%)`">
 			<view class="head-info" v-if="basicInfoData">

+ 6 - 4
pages/replenishmentManage/outWarehousing.vue

@@ -1,10 +1,12 @@
 <template>
 	<view class="replenishment-outWarehousing-wrap">
 		<u-navbar back-text="补货出库" :border-bottom="false" :background="{backgroundColor: $config('primaryColor')}" back-icon-color="#fff" :back-text-style="{ color: '#fff' }">
-			<view slot='right' style="padding: 0 30upx;color: #ffffff;" @click="creatSalesOrder">
-				<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
-				<text style="margin-left: 6rpx;">生成销售单</text>
-			</view>
+			<template v-slot:right>
+				<view style="padding: 0 30upx;color: #ffffff;" @click="creatSalesOrder">
+					<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
+					<text style="margin-left: 6rpx;">生成销售单</text>
+				</view>
+			</template>
 		</u-navbar>
 		<view class="replenishment-outWarehousing-body" :style="`backgroundImage:linear-gradient(180deg, ${$config('primaryColor')}, #F5F6F7 12%)`">
 			<view class="head-info" v-if="basicInfoData">

+ 6 - 4
pages/replenishmentManage/signWarehousing.vue

@@ -1,10 +1,12 @@
 <template>
 	<view class="replenishment-putWarehousing-wrap">
 		<u-navbar back-text="补货签收" :border-bottom="false" :background="{backgroundColor: $config('primaryColor')}" back-icon-color="#fff" :back-text-style="{ color: '#fff' }">
-			<view slot='right' style="padding: 0 30upx;color: #ffffff;" @click="creatSalesOrder">
-				<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
-				<text style="margin-left: 6rpx;">生成销售单</text>
-			</view>
+			<template v-slot:right>
+				<view style="padding: 0 30upx;color: #ffffff;" @click="creatSalesOrder">
+					<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
+					<text style="margin-left: 6rpx;">生成销售单</text>
+				</view>
+			</template>
 		</u-navbar>
 		<view class="replenishment-putWarehousing-body" :style="`backgroundImage:linear-gradient(180deg, ${$config('primaryColor')}, #F5F6F7 12%)`">
 			<view class="head-info" v-if="basicInfoData">

+ 1 - 1
pages/sales/edit.vue

@@ -18,7 +18,7 @@
 			<!-- 标题 -->
 			<view class="sales-product-header border-b flex align_center justify_between">
 				<u-section title="产品列表" :right="pageData.type=='edit'" :line-color="$config('primaryColor')">
-					<template slot="right" v-if="pageData.type=='edit'">
+					<template v-slot:right v-if="pageData.type=='edit'">
 						<view class="sales-product-operation">
 							<u-button @click="discountModal=true" size="mini" :hair-line="false" shape="circle" plain type="primary" hover-class="none">
 								打折

+ 9 - 3
pages/sales/productSearch.vue

@@ -5,9 +5,11 @@
 				<u-form-item label="车架号(VIN)" prop="vinCode" class="form-item">
 					<u-input v-model.trim="form.vinCode" :maxlength="17" placeholder="请输入车架号" input-align="right" />
 					<u-upload :custom-btn="true" ref="uUpload" :show-upload-list="false" :action="action" :form-data="{savePathType: 'local'}" @on-success="uploadSuccess" :max-size="2 * 1024 * 1024">
-						<view slot="addBtn" class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
+						<template v-slot:addBtn>
+						<view class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
 							<u-icon name="camera-fill" color="#c8c0cc" size="34" style="margin-left: 14upx;"></u-icon>
 						</view>
+						</template>
 					</u-upload>
 				</u-form-item>
 				<u-form-item label="产品编码" prop="productCode" class="form-item">
@@ -29,10 +31,14 @@
 					<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>
+					<template v-slot:right>
+						<u-switch v-model="form.cost"></u-switch>
+					</template>
 				</u-form-item>
 				<u-form-item label="市级价">
-					<u-switch slot="right" v-model="form.cityPrice"></u-switch>
+					<template v-slot:right>
+						<u-switch v-model="form.cityPrice"></u-switch>
+					</template>
 				</u-form-item>
 			</u-form>
 			<view class="uni-list-btns">

+ 3 - 1
pages/sales/salesRecord.vue

@@ -8,11 +8,13 @@
 			<view class="search-box">
 				<!-- <u-cell-group>
 					<u-cell-item value="去选择" @click="toChooseCust">
-						<view slot="title">
+						<template v-slot:title>
+						<view>
 							选择客户:
 							<u-tag v-if="queryparams.buyerName" :text="queryparams.buyerName" closeable :show="show" @close="tagClick" shape="circle" />
 							<u-tag v-else :text="'全部'" shape="circle" />
 						</view>
+						</template>
 					</u-cell-item>
 				</u-cell-group> -->
 				<u-search placeholder="输入客户名称搜索" v-model="queryparams.buyerNameCurrent" @change="changeInput" @clear="tagClick" @search="getList(1)" @custom="getList(1)"></u-search>

+ 8 - 6
pages/shelfSetting/editShelfHw.vue

@@ -1,12 +1,14 @@
 <template>
 	<view class="content flex flex_column">
 		<u-navbar back-text="编辑货位" :border-bottom="false">
-			<view slot='right' 
-			style="padding: 0 30upx;" 
-			@click="enableShelfProduct" 
-			v-if="type=='edit'&&nowData&&nowData.shelfProductApiEntity&&(!nowData.shelfProductApiEntity.qty||(nowData.shelfProductApiEntity.enableFlag==0&&nowData.shelfProductApiEntity.qty))">
-				<text :style="{color:nowData&&nowData.shelfProductApiEntity.enableFlag==1?$config('errorColor'):$config('primaryColor')}">{{nowData&&nowData.shelfProductApiEntity.enableFlag==1?'禁用':'启用'}}</text>
-			</view>
+			<template v-slot:right>
+				<view 
+				style="padding: 0 30upx;" 
+				@click="enableShelfProduct" 
+				v-if="type=='edit'&&nowData&&nowData.shelfProductApiEntity&&(!nowData.shelfProductApiEntity.qty||(nowData.shelfProductApiEntity.enableFlag==0&&nowData.shelfProductApiEntity.qty))">
+					<text :style="{color:nowData&&nowData.shelfProductApiEntity.enableFlag==1?$config('errorColor'):$config('primaryColor')}">{{nowData&&nowData.shelfProductApiEntity.enableFlag==1?'禁用':'启用'}}</text>
+				</view>
+			</template>
 		</u-navbar>
 		<view class="form-body">
 			<u-form :model="form" label-width="180rpx" :error-type="['toast']" ref="uForm">

+ 7 - 5
pages/shelfSetting/shelfSet.vue

@@ -2,11 +2,13 @@
 	<view class="content">
 		<u-navbar back-text="货架设置" :border-bottom="false" :background="{backgroundColor: $config('primaryColor')}"
 			back-icon-color="#fff" :back-text-style="{ color: '#fff' }">
-			<view slot='right' style="padding: 0 30upx;color: #ffffff;" @click="toPlRacking" v-if="shelfPlaceList">
-				<u-icon name="piliangshangjia" custom-prefix="iscm-icon"></u-icon>
-				<text style="margin-left: 6rpx;">批量上架</text>
-				<u-badge v-if="showDot" :is-dot="true" size="mini" type="error"></u-badge>
-			</view>
+			<template v-slot:right>
+				<view style="padding: 0 30upx;color: #ffffff;" @click="toPlRacking" v-if="shelfPlaceList">
+					<u-icon name="piliangshangjia" custom-prefix="iscm-icon"></u-icon>
+					<text style="margin-left: 6rpx;">批量上架</text>
+					<u-badge v-if="showDot" :is-dot="true" size="mini" type="error"></u-badge>
+				</view>
+			</template>
 		</u-navbar>
 		<view class="body-content flex flex_column">
 			<view class="card-box" v-if="detailData">

+ 6 - 4
pages/shuntBackManage/addBackOrder.vue

@@ -1,10 +1,12 @@
 <template>
 	<view class="content flex flex_column">
 		<u-navbar back-text="新增调回单" :border-bottom="false" :background="{backgroundColor: $config('primaryColor')}" back-icon-color="#fff" :back-text-style="{ color: '#fff' }">
-			<view slot='right' style="padding: 0 30upx;color: #ffffff;" v-if="recallBillList.length" @click="toChooseProduct">
-				<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
-				<text style="margin-left: 6rpx;">选择产品</text>
-			</view>
+			<template v-slot:right>
+				<view style="padding: 0 30upx;color: #ffffff;" v-if="recallBillList.length" @click="toChooseProduct">
+					<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
+					<text style="margin-left: 6rpx;">选择产品</text>
+				</view>
+			</template>
 		</u-navbar>
 		<view class="headerName u-flex">
 			<text class="barBox"></text>

+ 9 - 5
pages/shuntBackManage/detail.vue

@@ -1,11 +1,15 @@
 <template>
 	<view class="shuntBack-detail-wrap">
 		<u-navbar back-text="调回详情" :border-bottom="false" :background="{backgroundColor: $config('primaryColor')}" back-icon-color="#fff" :back-text-style="{ color: '#fff' }">
-			<view slot='right' style="padding: 0 30upx;color: #ffffff;" @click="refundModal = true" 
-			v-if="basicInfoData&&basicInfoData.shelfInfo.state!='WRITE_OFF'&&basicInfoData.shelfInfo.state!='SUSPEND'">
-				<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
-				<text style="margin-left: 6rpx;">生成销售退货单</text>
-			</view>
+			<template v-slot:right>
+				<view 
+				style="padding: 0 30upx;color: #ffffff;" 
+				@click="refundModal = true" 
+				v-if="basicInfoData&&basicInfoData.shelfInfo.state!='WRITE_OFF'&&basicInfoData.shelfInfo.state!='SUSPEND'">
+					<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
+					<text style="margin-left: 6rpx;">生成销售退货单</text>
+				</view>
+			</template>
 		</u-navbar>
 		
 		<view class="shuntBack-detail-body">

+ 6 - 4
pages/soldOut/creatOrder.vue

@@ -1,10 +1,12 @@
 <template>
 	<view class="content flex flex_column">
 		<u-navbar back-text="待补货产品" :border-bottom="false" :background="{backgroundColor: $config('primaryColor')}" back-icon-color="#fff" :back-text-style="{ color: '#fff' }">
-			<view slot='right' style="padding: 0 30upx;color: #ffffff;" v-if="chooseList.length" @click="toChooseProduct">
-				<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
-				<text style="margin-left: 6rpx;">选择产品</text>
-			</view>
+			<template v-slot:right>
+				<view style="padding: 0 30upx;color: #ffffff;" v-if="chooseList.length" @click="toChooseProduct">
+					<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
+					<text style="margin-left: 6rpx;">选择产品</text>
+				</view>
+			</template>
 		</u-navbar>
 		<view class="searchBar">
 			<view class="p-title flex align_center">

+ 6 - 2
pages/stock/index.vue

@@ -28,8 +28,12 @@
 					<text style="display: block;text-align: center;line-height: 32px;">至</text>
 					<u-input type="number" :min="0" :max="999999" v-model.trim="form.maxUnsalableDays" placeholder="截止天数" input-align="center" />
 				</u-form-item>
-				<u-form-item label="只查看有库存" inputAlign="right"><u-switch slot="right" v-model="form.zeroQtyFlag"></u-switch></u-form-item>
-				<u-form-item label="包括禁用产品" inputAlign="right"><u-switch slot="right" v-model="form.enableFlag"></u-switch></u-form-item>
+				<u-form-item label="只查看有库存" inputAlign="right">
+					<u-switch v-model="form.zeroQtyFlag"></u-switch>
+				</u-form-item>
+				<u-form-item label="包括禁用产品" inputAlign="right">
+					<u-switch v-model="form.enableFlag"></u-switch>
+				</u-form-item>
 			</u-form>
 			<view class="form-footer-btn">
 				<u-button size="medium" shape="circle" hover-class="none" @click="handleClean">清空</u-button>

+ 6 - 2
pages/userCenter/index.vue

@@ -23,11 +23,15 @@
 		<view class="user-list" :style="`backgroundImage:linear-gradient(180deg, ${$config('primaryColor')}, #F5F6F7 30%)`">
 			<u-cell-group>
 				<u-cell-item icon="volume" icon-size="36" :icon-style="{color:'#00aaff'}" index="3" @click="toPage(3)" title="消息">
-					<u-badge :count="noReadNums" :absolute="false" slot="right-icon"></u-badge>
+					<template v-slot:right-icon>
+					<u-badge :count="noReadNums" :absolute="false"></u-badge>
+					</template>
 				</u-cell-item>
 				<u-cell-item icon="edit-pen" icon-size="38" :icon-style="{color:'#00aaff'}" index="1" @click="toPage(1)" title="修改密码"></u-cell-item>
 				<u-cell-item  index="1" @click="toPage(4)" title="系统参数" v-if="$hasPermissions('M_ARStatement_mobile')">
-					<u-icon slot="icon" name="xitongcanshu-05" custom-prefix="iscm-icon" size="42" color="#00aaff"></u-icon>
+					<template v-slot:icon>
+					<u-icon name="xitongcanshu-05" custom-prefix="iscm-icon" size="42" color="#00aaff"></u-icon>
+					</template>
 				</u-cell-item>
 				<u-cell-item icon="reload" icon-size="35" :icon-style="{color:'#00aaff'}" index="1" @click="resetPrint" title="重置打印机"></u-cell-item>
 			</u-cell-group>

+ 22 - 22
pages/userCenter/setData.vue

@@ -4,28 +4,28 @@
 		<view class="con">
 			<u-cell-group :border="false">
 				<u-cell-item :title="item.paramName" v-for="(item, i) in systemList" :key="item.id" @click="openModal(item,i)">
-					<u-input
-						v-show="item.remarks != 'FLAG'"
-						slot="right-icon"
-						v-model="item.value"
-						disabled
-						@click="openModal(item,i)"
-						placeholder="请选择"
-						placeholder-style="text-align:right"
-						:custom-style="inputStyle"
-					/>
-					<u-switch
-						v-show="item.remarks == 'FLAG'"
-						:size="40"
-						:active-color="activeColor"
-						slot="right-icon"
-						:value="item.paramValue == 1"
-						@change="
-							status => {
-								changeSwitch(status, i);
-							}
-						"
-					></u-switch>
+					<template v-slot:right-icon>
+						<u-input
+							v-show="item.remarks != 'FLAG'"
+							v-model="item.value"
+							disabled
+							@click="openModal(item,i)"
+							placeholder="请选择"
+							placeholder-style="text-align:right"
+							:custom-style="inputStyle"
+						/>
+						<u-switch
+							v-show="item.remarks == 'FLAG'"
+							:size="40"
+							:active-color="activeColor"
+							:value="item.paramValue == 1"
+							@change="
+								status => {
+									changeSwitch(status, i);
+								}
+							"
+						></u-switch>
+					</template>
 				</u-cell-item>
 			</u-cell-group>
 		</view>

+ 3 - 5
pages/xtNotice/xtNotice.vue

@@ -55,11 +55,6 @@
 				this.pageInit()
 			}
 		},
-		filters: {
-			filterHtml: function(str) {
-				return str?str.replace(/<.*?>/g,""):""
-			}
-		},
 		onNavigationBarButtonTap(e) {
 			uni.showLoading({
 				mask:true,
@@ -79,6 +74,9 @@
 				this.pageNo = 1
 				this.getMessageList()
 			},
+			filterHtml(str) {
+				return str?str.replace(/<.*?>/g,""):""
+			},
 			// 获取数据列表
 			getMessageList(){
 				this.status = "loading"

+ 1 - 1
uni_modules/vk-uview-ui/components/u-navbar/u-navbar.vue

@@ -300,7 +300,7 @@
 		flex: 1;
 	}
 
-	.u-navbar-right {
+	.u-navbar-right,.u-slot-right {
 		flex: 1;
 		@include vue-flex;
 		align-items: center;