颜色管理

ghsApp/src/admin/billing/affirm.vue

@@ -42,7 +42,7 @@
             </view>
             <view class="summary-bar">
               <view class="operate-view" v-if="isScanEnv" @click="removeFromSave(option.customId)"> <text class="iconfont iconshanchu1"></text>清除花材 </view>
-              <view class="operate-view" v-else @click="gobackEvent"><text class="iconfont icongouwuche"></text>重选花材</view>
+              <view class="operate-view" v-else @click="gobackEvent"><text class="iconfont icongouwuche"></text>修改花材</view>
               <view class="describe-view">共{{ selectList.length }}种，合计 ¥<text class="price">{{ allPrice }}</text></view>
             </view>
             <view class="summary-bar">

ghsApp/src/admin/billing/customerAffirm.vue

@@ -40,7 +40,7 @@
 						<view class="summary-bar">
 							<view class="operate-view" @click="gobackEvent">
 								<text class="iconfont icongouwuche"></text>
-								重选花材
+								修改花材
 							</view>
 							<view class="describe-view">
 								共{{ allCount }}种,

ghsApp/src/admin/breakage/confirm.vue

@@ -32,7 +32,7 @@
             <view class="summary-bar">
               <view class="operate-view" @click="gobackEvent">
                 <text class="iconfont icongouwuche"></text>
-                重选花材
+                修改花材
               </view>
               <view class="describe-view">
                 共{{ selectList.length }}种

ghsApp/src/admin/item/add.vue

@@ -5,12 +5,12 @@
       <div class="module-com input-line-wrap">
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">花材名称</div>
+          <div class="tui-title">名称</div>
           <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请填写名称" @input="fillName($event)" maxlength="50" type="text" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">花材品种</div>
+          <div class="tui-title">平台名称</div>
           <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="notModify">{{form.name}}</view>
         </tui-list-cell>
 
@@ -87,8 +87,8 @@
           <view class="tui-title">颜色管理</view>
           <view class="switch_bx">
             <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
-            <text v-if="form.variety == 1">需要</text>
-            <text v-else>不需要</text>
+            <text v-if="form.variety == 1">开启</text>
+            <text v-else>关闭</text>
           </view>
         </tui-list-cell>
 
@@ -163,7 +163,7 @@ export default {
         id:0,
         name:"",
         py:"",
-        stock:'',
+        stock:0,
         ratio:'',
         bigUnitId:1,
         smallUnitId:2,
@@ -178,6 +178,7 @@ export default {
         status:2,
         delStatus:0,
         itemId:0,
+        variety:0
       },
       itemClassSelectedData:{},
       itemClassData:[],

ghsApp/src/admin/item/components/ItemStock.vue

@@ -8,7 +8,10 @@
 			<image :src="info.cover" style="width:160upx;height:160upx;" lazy-load="true" :lazy-load-margin="0"></image>
 		</view>
 		<view class="cmd-info_bx active" @click="pageTo({url: '/admin/item/detail',query: {id: info.id}})">
-			<view class="tit">{{ info.itemName || "" }}</view>
+			<view class="tit">{{ info.itemName || "" }}
+				<text v-if="info.variety && info.variety ==1" class="show-color">
+				</text>
+			</view>
 			<view class="kc">￥{{ parseFloat(info.price) }} <text style="margin-left:25upx;color:#555555;font-weight:normal;">￥{{ parseFloat(info.skPrice) }}</text></view>
 			<view class="num-open_bx">
 				<template>
@@ -145,6 +148,15 @@ export default {
 			white-space: nowrap;
 			text-overflow: ellipsis;
 			width:350upx;
+			.show-color{
+				display:inline-block;
+				width:25upx;
+				height:25upx;
+				background-color:rgb(9, 199, 9);
+				border-radius:15upx;
+				border:none;
+				margin-left:8upx;
+			}
 		}
 		& .kc {
 			color: red;

ghsApp/src/admin/item/copy.vue

@@ -4,12 +4,12 @@
       <view class="module-com input-line-wrap">
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">花材名称</view>
+          <view class="tui-title">名称</view>
           <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请填写名称" @input="fillName($event)" maxlength="50" type="text" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">花材品种</view>
+          <view class="tui-title">平台名称</view>
           <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="notModify">{{productData.ptItemInfo ? productData.ptItemInfo.name : ''}}</view>
           
         </tui-list-cell>
@@ -86,8 +86,8 @@
           <view class="tui-title">颜色管理</view>
           <view class="switch_bx">
             <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
-            <text v-if="form.variety == 1">需要</text>
-            <text v-else>不需要</text>
+            <text v-if="form.variety == 1">开启</text>
+            <text v-else>关闭</text>
           </view>
         </tui-list-cell>
 
@@ -162,7 +162,7 @@ export default {
         id:0,
         name:"",
         py:"",
-        stock:'',
+        stock:0,
         ratio:'',
         bigUnitId:1,
         smallUnitId:2,
@@ -177,6 +177,7 @@ export default {
         status:2,
         delStatus:0,
         itemId:0,
+        variety:0
       },
       itemClassSelectedData:{},
       itemClassData:[],

ghsApp/src/admin/item/detail.vue

@@ -5,12 +5,12 @@
       <view class="module-com input-line-wrap">
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">花材名称</view>
+          <view class="tui-title">名称</view>
           <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请填写名称" @input="fillName($event)" maxlength="50" type="text" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">花材品种</view>
+          <view class="tui-title">平台名称</view>
           <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="notModify">{{productData.ptItemInfo ? productData.ptItemInfo.name : ''}}</view>
         </tui-list-cell>
 
@@ -87,8 +87,8 @@
           <view class="tui-title">颜色管理</view>
           <view class="switch_bx">
             <switch :checked="form.variety == 0 ? false : true" @change="varietyChange" style="transform: scale(0.8,0.8)" />
-            <text v-if="form.variety == 1">需要</text>
-            <text v-else>不需要</text>
+            <text v-if="form.variety == 1">开启</text>
+            <text v-else>关闭</text>
           </view>
         </tui-list-cell>
 

ghsApp/src/pagesPurchase/details.vue

@@ -27,7 +27,7 @@
 						</view>
 						<view class="summary-bar">
 							<view class="operate-view" @click="gobackEvent">
-								<text class="iconfont icongouwuche"></text>重选花材
+								<text class="iconfont icongouwuche"></text>修改花材
 							</view>
 							<view class="describe-view">
 								共{{ selectList.length }}种,合计 ¥{{ selectAllPrice }}

ghsApp/src/pagesStorehouse/allot/addExDetails.vue

@@ -42,7 +42,7 @@
             </view>
             <view class="summary-bar">
               <view class="operate-view" v-if="isScanEnv" @click="removeFromSave(option.inShopId)"> <text class="iconfont iconshanchu1"></text>清除花材 </view>
-              <view class="operate-view" v-else @click="reSelectItem"><text class="iconfont icongouwuche"></text>重选花材</view>
+              <view class="operate-view" v-else @click="reSelectItem"><text class="iconfont icongouwuche"></text>修改花材</view>
               <view class="describe-view">共{{ selectList.length }}种</view>
             </view>
           </view>