花材详情

ghsApp/src/admin/item/add.vue

@@ -62,20 +62,6 @@
           </view>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">比例类型</div>
-          <radio-group class="tui-input" @change="ratioTypeChange">
-            <label class="list" for="fixedLink">
-              <radio id="fixedLink" value="0" :checked="form.ratioType == 0" style="transform: scale(0.7,0.7);" />
-              <span class="checkbox-text" style="font-size:30upx;">固定</span>
-            </label>
-            <label class="list" for="dimLink">
-              <radio id="dimLink" value="1" :checked="form.ratioType == 1" style="transform: scale(0.7,0.7);" />
-              <span class="checkbox-text" style="font-size:30upx;">模糊（若干）</span>
-            </label>
-          </radio-group>
-        </tui-list-cell>
-
         <tui-list-cell class="line-cell" :arrow="true">
           <div class="tui-title">大单位</div>
           <picker mode="selector" :value="form.bigUnitId" :range="unitData" range-key="name" @change="changeBigUnitFn" class="tui-input" >
@@ -94,9 +80,23 @@
           </picker>
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :hover="false">
+          <div class="tui-title">包装类型</div>
+          <radio-group class="tui-input" @change="ratioTypeChange">
+            <label class="list" for="fixedLink">
+              <radio id="fixedLink" value="0" :checked="form.ratioType == 0" style="transform: scale(0.7,0.7);" />
+              <span class="checkbox-text" style="font-size:30upx;">固定支数</span>
+            </label>
+            <label class="list" for="dimLink">
+              <radio id="dimLink" value="1" :checked="form.ratioType == 1" style="transform: scale(0.7,0.7);" />
+              <span class="checkbox-text" style="font-size:30upx;">没有固定</span>
+            </label>
+          </radio-group>
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false" v-if="form.ratioType == 0">
-          <div class="tui-title">单位比</div>
-          <input v-model="form.ratio" placeholder-class="phcolor" class="tui-input" name="ratio" placeholder="1扎=20支，请填写20" maxlength="50" type="number" />
+          <div class="tui-title">几支装</div>
+          <input v-model="form.ratio" placeholder-class="phcolor" class="tui-input" name="ratio" placeholder="20支装请填20" maxlength="50" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -112,14 +112,6 @@
           <input v-model="form.stockWarning" placeholder-class="phcolor" class="tui-input" name="stockWarning" placeholder="请填写" maxlength="50" type="number" />
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">花材状态</div>
-          <div class="switch_bx">
-            <text v-if="form.status == 1">上架</text>
-            <text v-else>下架</text>
-          </div>
-        </tui-list-cell>
-
       </div>
 
       <div class="module-com input-line-wrap goods-wrap">
@@ -780,7 +772,7 @@ export default {
       margin-right: 20upx;
       margin-bottom: 20upx;
       position: relative;
-      z-index: 9999;
+      z-index: 99;
     }
   }
 }

ghsApp/src/admin/item/detail.vue

@@ -66,20 +66,20 @@
         <tui-list-cell class="line-cell" :arrow="false" :hover="false">
         <view class="tui-title" style="color:#19b31f;">平均成本</view>
         <view style="color:#19b31f;width:300upx;" @click="showModifyAvCost(productData)">{{productData.avCost?parseFloat(productData.avCost):0}}</view>
-        <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goAvCostDetail(productData)">变动记录</button>
+        <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goAvCostDetail(productData)">变动明细</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :arrow="false" :hover="false">
         <view class="tui-title">实时成本</view>
         <input v-model="form.cost" style="width:300upx;" placeholder-class="phcolor" @focus="form.cost=''" class="tui-input" name="cost" placeholder="请输入" type="digit"/>
-        <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goCostDetail(productData)">变动记录</button>
+        <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goCostDetail(productData)">变动明细</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title" style="color:#3385FF;font-weight:bold;">库存</view>
           <input v-model="form.stock" style="color:#3385FF;width:300upx;font-weight:bold;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
 
-          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData)">变动记录</button>
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData)">变动明细</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -128,10 +128,10 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">几支装类型</view>
+          <view class="tui-title">包装类型</view>
           <view class="tui-input">
             <button class="admin-button-com middle" :class="form.ratioType == 0 ? 'blue' : 'default'" @click="ratioTypeChange(0)">固定支数</button>
-            <button class="admin-button-com middle" :class="form.ratioType == 1 ? 'blue' : 'default'" @click="ratioTypeChange(1)" style="margin-left: 20upx;">不固定支数</button>
+            <button class="admin-button-com middle" :class="form.ratioType == 1 ? 'blue' : 'default'" @click="ratioTypeChange(1)" style="margin-left:140upx;">没有固定</button>
           </view>
         </tui-list-cell>
 
@@ -1454,7 +1454,7 @@ export default {
       margin-right: 20upx;
       margin-bottom: 20upx;
       position: relative;
-      z-index: 9999;
+      z-index: 99;
     }
   }
 }

ghsApp/src/pagesStorehouse/stockWarn/detailed.vue

@@ -20,8 +20,8 @@
 				</t-table>
 			</view>
 			<view style="margin:20upx 0 0 70upx;background-color:#F0F2F6;padding-bottom:15upx;">
-				<button class="admin-button-com" :class="[hideCost==0?'blue':'']" style="margin-right:20upx;" @click="hideCost=0">开启成本</button>
-				<button class="admin-button-com" :class="[hideCost==1?'blue':'']" @click="hideCost=1">关闭成本</button>
+				<button class="admin-button-com middle" :class="[hideCost==0?'blue':'']" style="margin-right:40upx;" @click="hideCost=0">开启成本</button>
+				<button class="admin-button-com middle" :class="[hideCost==1?'blue':'']" @click="hideCost=1">关闭成本</button>
 			</view>
 		</view>
 		
@@ -223,7 +223,7 @@ export default {
 	.main-view {
 		flex: 1;
 		background-color: #f9fbfc;
-		margin-top: 200upx;
+		margin-top: 220upx;
 		
 		.space-view {
 			background-color: #fff;