列表优化

ghsApp/src/admin/billing/affirm.vue

@@ -54,10 +54,10 @@
           </view>
         </view>
 
-        <modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
+        <modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.name" color="#333" :size="32" padding="30rpx 30rpx" >
           <template slot="customContent">
             <view class="select-cmd_bx" v-if="customData">
-              <view class="kc"><text class="unit_price">库存 {{ parseFloat(customData.stock) }}</text><text class="unit_price"> 单价 {{ parseFloat(customData.price) }}</text>1扎={{customData.ratio}}支</view>
+              <view class="kc"><text class="unit_price">库存 {{ parseFloat(customData.stock) }}</text><text class="unit_price"> ¥{{ parseFloat(customData.price) }}</text></view>
 
               <view class="num_bx">
                 <input style="width: 430upx" v-model="customData.userPrice" @focus="customData.userPrice = null" type="number" placeholder="单价" :disabled="false" />

ghsApp/src/admin/billing/customerPlace.vue

@@ -90,7 +90,7 @@
 			:show="isModel"
 			@cancel="modalCancel"
 			@click="affirm"
-			:title="customData.itemName"
+			:title="customData.name"
 			color="#333"
 			:size="32"
 			padding="30upx 30upx"

ghsApp/src/admin/billing/index.vue

@@ -58,12 +58,12 @@
 
 		</view>
 
-		<modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
+		<modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.name" color="#333" :size="32" padding="30rpx 30rpx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc">
 						<text class="unit_price">库存 {{ parseFloat(customData.stock) }}</text>
-						<text class="unit_price"> 单价 {{ parseFloat(customData.price) }}</text>
+						<text class="unit_price"> ¥{{ parseFloat(customData.price) }}</text>
 						<text>{{customData.ratio}}{{customData.smallUnit}}/{{customData.bigUnit}}</text>
 					</view>
 					<view class="num_bx">

ghsApp/src/admin/breakage/confirm.vue

@@ -11,19 +11,19 @@
                   <image class="item-icon" :src="item.cover" />
                   <view class="item-info">
                     <view class="info-line">
-                      <text class="item-name">{{ item.itemName }}</text>
+                      <text class="item-name">{{ item.name || '' }}</text>
                       <text class="item-price">
                         <text class="unit"></text>
                         <text class="price">
-                          <text v-if="item.bigCount > 0">{{`${item.bigCount}`}}扎</text>
-                          <text v-if="item.smallCount > 0">{{`${item.smallCount}`}}支</text>
+                          <text v-if="item.bigCount > 0">{{`${item.bigCount}`}}{{item.bigUnit}}</text>
+                          <text v-if="item.smallCount > 0">{{`${item.smallCount}`}}{{item.smallUnit}}</text>
                         </text>
                       </text>
                     </view>
                     <view class="info-line">
-                      <text class="item-type"></text>
-                      <text class="item-count">
-                      </text>
+                      <text class="item-type" v-if="ratioType == 0">{{item.ratio}}{{item.smallUnit}}/{{item.bigUnit}}</text>
+                      <text class="item-type" v-else>若干{{item.smallUnit}}/{{item.bigUnit}}</text>
+                      <text class="item-count"></text>
                     </view>
                   </view>
                 </view>
@@ -293,14 +293,15 @@ export default {
               justify-content: space-between;
               align-items: flex-end;
               .item-name {
-                color: #666;
-                font-size: 28upx;
+                color: #333333;
+                font-size: 32upx;
+                font-weight: bold;
               }
               .item-price {
                 color: #333;
                 font-size: 22upx;
                 .price {
-                  font-size: 32upx;
+                  font-size: 30upx;
                   font-weight: bold;
                 }
               }

ghsApp/src/admin/breakage/index.vue

@@ -49,7 +49,7 @@
 
 		</view>
 		
-		<modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
+		<modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.name" color="#333" :size="32" padding="30rpx 30rpx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"><text class="unit_price">库存 {{ customData.stock||0 }}</text></view>

ghsApp/src/admin/breakage/info.vue

@@ -29,14 +29,13 @@
 								<view class="info-line">
 									<text class="item-name">{{ s.name }}</text>
 									<text class="item-price">
-										<text class="unit">¥</text>
-										<text class="price">{{ s.itemCost?parseFloat(s.itemCost):0 }}</text>
+										<text class="price">{{s.itemNum?parseFloat(s.itemNum):0}}扎</text>
 									</text>
 								</view>
 								<view class="info-line">
 									<text class="item-type"></text>
 									<text class="item-count">
-										<text>{{s.itemNum?parseFloat(s.itemNum):0}}扎</text>
+										<text>¥{{ s.itemCost?parseFloat(s.itemCost):0 }}</text>
 									</text>
 								</view>
 							</view>
@@ -209,14 +208,15 @@ export default {
 						justify-content: space-between;
 						align-items: flex-end;
 						.item-name {
-							color: #666;
-							font-size: 28upx;
+							color: #333333;
+							font-size:32upx;
+							font-weight:bold;
 						}
 						.item-price {
-							color: #333;
+							color: #333333;
 							font-size: 22upx;
 							.price {
-								font-size: 32upx;
+								font-size:30upx;
 								font-weight: bold;
 							}
 						}

ghsApp/src/admin/breakage/result.vue

@@ -5,7 +5,7 @@
 			<view class="result-view">
 				<view class="iconfont iconchenggong"></view>
 				<view class="result-title">报损成功</view>
-				<button class="admin-button-com big blue" style="width:45vw;" @click="goBackHome">返回首页</button>
+				<button class="admin-button-com big blue" style="width:45vw;" @click="goBackHome">返回列表</button>
 			</view>
 		</view>
 	</view>

ghsApp/src/pagesOrder/select.vue

@@ -82,7 +82,7 @@
 			</block>
 		</view>
 		<!-- :maskClosable="false" -->
-		<modal-module :show="isModel" @cancel="modalCancel" @click="affirm" :title="customData.itemName" color="#333" :size="32" padding="30upx 30upx">
+		<modal-module :show="isModel" @cancel="modalCancel" @click="affirm" :title="customData.name" color="#333" :size="32" padding="30upx 30upx">
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"> 库存{{ customData.stock }} </view>

ghsApp/src/pagesPurchase/add.vue

@@ -45,7 +45,7 @@
 			</scroll-view>
 		</view>
 
-		<modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" :button="showButton" >
+		<modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.name" color="#333" :size="32" padding="30rpx 30rpx" :button="showButton" >
 			<template slot="customContent">
 				<view class="select-view">
 					<view class="select-cmd_bx">

ghsApp/src/pagesPurchase/details.vue

@@ -10,7 +10,7 @@
 								<image class="item-icon" :src="item.itemCover || item.cover" alt="" />
 								<view class="item-info">
 									<view class="info-line">
-										<text class="item-name">{{ item.itemName }}</text>
+										<text class="item-name">{{ item.name||'' }}</text>
 										<text class="item-price">
 											<text class="price">¥{{parseFloat((Number(item.bigCount)*Number(item.userPrice)).toFixed(2))}}</text>
 										</text>
@@ -431,13 +431,14 @@ export default {
 							align-items: flex-end;
 							.item-name {
 								color:black;
-								font-size:30upx;
+								font-size:32upx;
+								font-weight: bold;
 							}
 							.item-price {
 								color: black;
 								font-size: 22upx;
 								.price {
-									font-size: 32upx;
+									font-size: 30upx;
 									font-weight: bold;
 								}
 							}

ghsApp/src/pagesPurchase/info.vue

@@ -417,13 +417,14 @@ export default {
 						align-items: flex-end;
 						.item-name {
 							color: #333333;
-							font-size:30upx;
+							font-size:32upx;
+							font-weight: bold;
 						}
 						.item-price {
 							color: #333;
 							font-size: 22upx;
 							.price {
-								font-size: 32upx;
+								font-size: 30upx;
 								font-weight: bold;
 							}
 						}

ghsApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -18,7 +18,7 @@
                   <!-- #endif -->
                   <view class="item-info">
                     <view class="info-line">
-                      <text class="item-name">{{ item.itemName }}</text>
+                      <text class="item-name">{{ item.name || '' }}</text>
                       <text class="item-price">
                         <text class="unit"></text>
                         <text class="price"></text>
@@ -80,34 +80,22 @@
     <view v-if="isScanEnv" @click="changeGet" style="width:125upx;height:125upx;display:flex;justify-content:center;align-items:center;font-size:60upx;
     background:#3385ff;color:white;z-index:9999;position:fixed;bottom:230upx;right:40upx;border-radius:60upx;">{{calc=='add'?'+':'-'}}</view>
 
-        <modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
+        <modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.name" color="#333" :size="32" padding="30rpx 30rpx" >
           <template slot="customContent">
             <view class="select-cmd_bx" v-if="customData">
-              <view class="kc"><text class="unit_price">库存 {{ parseFloat(customData.stock) }}</text><text class="unit_price"> 单价 {{ parseFloat(customData.price) }}</text>1扎={{customData.ratio}}支</view>
-
-              <view class="num_bx">
-                <input style="width: 430upx" v-model="customData.userPrice" @focus="customData.userPrice = null" type="number" placeholder="单价" />
-                <text style="font-size:35upx;font-weight:bold;color:#666666;">元</text>
-              </view>
+              <view class="kc"><text class="unit_price">库存 {{ parseFloat(customData.stock) }}</text><text class="unit_price"></view>
 
               <view class="num_bx">
                 <!-- #ifdef APP-PLUS -->
                 <input style="width: 430upx" v-model="customData.bigCount" v-if="globalUnitType == 0" type="number" />
                 <text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 0">扎</text>
-                <input style="width: 430upx" v-model="customData.smallCount" v-if="globalUnitType == 1" type="number" />
-                <text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 1">支</text>
                 <!-- #endif -->
 
                 <!-- #ifdef MP-WEIXIN -->
                 <input style="width: 430upx" v-model="customData.bigCount" v-if="globalUnitType == 0" :focus="isAddInputFocus" type="number" />
                 <text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 0">扎</text>
-                <input style="width: 430upx" v-model="customData.smallCount" v-if="globalUnitType == 1" :focus="isAddInputFocus" type="number" />
-                <text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 1">支</text>
                 <!-- #endif -->
 
-                <image @click="switchGlobalUnitType" :src="`${constant.imgUrl}/icon/switch/switch128.png`" 
-                style="width:86upx;height:86upx;position:relative;top:-60upx;right:0upx;" mode="widthFix"></image>
-
               </view>
 
             </view>
@@ -137,7 +125,7 @@ export default {
 		return {
 			selectJobType: "allotEx",
 			selectJobId:0,
-			autoLoad:true,
+			autoLoad:false,
 			form: {
 				date: "",
 				remark: "",
@@ -273,8 +261,9 @@ export default {
               justify-content: space-between;
               align-items: flex-end;
               .item-name {
-                color: #666;
-                font-size: 28upx;
+                color: #333333;
+                font-size:32upx;
+                font-weight: bold;
               }
               .item-price {
                 color: #333;

ghsApp/src/pagesStorehouse/allot/allotEx.vue

@@ -27,7 +27,7 @@
 		</scroll-view>
 
 		<view class="app-footer open_btn">
-			<view @click="getItem()" class="admin-button-com big default" style="margin-right:80upx;">
+			<view @click="getItem()" class="admin-button-com big blue" style="margin-right:80upx;">
 			有库存花材下载
 			</view>
 			<view @click="addEvent" class="admin-button-com big blue">新增出库</view>

ghsApp/src/pagesStorehouse/allot/exSelect.vue

@@ -59,10 +59,10 @@
 				</view>
 			</block>
 		</view>
-		<modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
+		<modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.name" color="#333" :size="32" padding="30rpx 30rpx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
-					<view class="kc"> 库存{{ customData.stock }} </view>
+					<view class="kc"> 库存{{ customData.stock?parseFloat(customData.stock):0 }} </view>
 					<view class="num_bx">
 						<!-- #ifdef APP-PLUS -->
 						<input style="width: 490upx" v-model="customData.bigCount" v-if="globalUnitType == 0" type="number" />

ghsApp/src/pagesStorehouse/inventory/select.vue

@@ -57,7 +57,7 @@
 			</block>
 		</view>
 
-		<modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.itemName" color="#333" :size="32" padding="30rpx 30rpx" >
+		<modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.name" color="#333" :size="32" padding="30rpx 30rpx" >
 			<template slot="customContent">
 				<view class="select-cmd_bx" v-if="customData">
 					<view class="kc"> 库存{{ customData.stock }} </view>