Răsfoiți Sursa

任务优化

shish 3 ani în urmă
părinte
comite
f1e9a431fb

+ 19 - 18
hdApp/src/admin/order/workOrder.vue

@@ -4,7 +4,7 @@
     <view class="affirm-view overscroll">
       <form>
 
-       <view class="module-com input-line-wrap">
+       <view class="module-com input-line-wrap" style="position:relative;">
 
         <tui-list-cell class="line-cell" :arrow="true">
           <view class="tui-title required">品类</view>
@@ -17,12 +17,12 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title required">数量</view>
-          <input v-model="form.num" placeholder-class="phcolor" class="tui-input" name="num" @focus="form.num=''" placeholder="填写数量" maxlength="50" type="number" />
+          <input v-model="form.num" placeholder-class="phcolor" class="tui-input" name="num" @focus="form.num=''" placeholder="填写数量" maxlength="50" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false" :arrow="false" >
           <view class="tui-title required">单价</view>
-          <input type="digit" @focus="goodsPrice=''" :focus="true" style="width:260upx;" v-model="goodsPrice" placeholder-class="tui-placeholder" placeholder="填写金额" />
+          <input type="digit" @focus="goodsPrice=''" :focus="true" style="width:260upx;" v-model="goodsPrice" placeholder-class="tui-placeholder" placeholder="填写金额" />
           <text style="color:#3385FF;font-weight:bold;">合计 ¥<text>{{orderTotalPrice}}</text></text>
         </tui-list-cell>
 
@@ -32,15 +32,6 @@
           <text style="color:red;font-weight:bold;" v-if="Number(debtFinalPrice)>0">尾款 ¥<text>{{debtFinalPrice}}</text></text>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :arrow="true">
-          <view class="tui-title required">每份用材</view>
-          <picker mode="selector" :value="form.flowerNum" :range="flowerNumList" range-key="num" @change="changeNumFn" class="tui-input" >
-            <input v-model="form.flowerNum" name="flowerNum" type="text" hidden />
-            <view v-if="form.flowerNum" style="height:45upx;" >{{ numSelectedData.name }}</view>
-            <view class="tui-placeholder" style="height:45upx;" v-else>请选择支数</view>
-          </picker>
-        </tui-list-cell>
-
           <tui-list-cell class="line-cell" :hover="false" :arrow="false" v-if="form.fromType == 3">
             <view class="tui-title">收款方式</view>
             <button @tap="form.hasPay = 1" class="admin-button-com middle" :class="form.hasPay == 1 ? 'blue' : 'default'">已收款</button>
@@ -55,6 +46,17 @@
             </picker>
           </tui-list-cell>
 
+          <tui-list-cell class="line-cell" :arrow="false" :hover="false">
+            <view class="tui-title required" style="margin-bottom:46upx;">每份支数</view>
+            <input type="number" v-model="form.flowerNum" @focus="form.flowerNum=''" style="width:350upx;margin-bottom:46upx;" name="flowerNum" placeholder-class="tui-placeholder" placeholder="每份使用花材的支数"/>
+          </tui-list-cell>
+
+          <view style="position:absolute;bottom:1upx;left:50upx;">
+            <block v-for="(numItem, numIndex) in flowerNumList" :key="numIndex">
+              <button class="admin-button-com mini-btn default" style="padding-top:13upx;padding-bottom:13upx;" @click="setNum(numItem.num)">{{numItem.name}}</button>
+            </block>
+          </view>
+
         </view>
 
         <view class="module-com input-line-wrap goods-wrap">
@@ -108,7 +110,7 @@ export default {
         kindId:'',
         cover:[],
         num:1,
-        flowerNum:0
+        flowerNum:''
       },
       goodsPrice:'',
 			payWayindex:0,
@@ -118,7 +120,7 @@ export default {
       currentImgData:[],
       dj:'',
       numSelectedData:{num:0,name:0},
-      flowerNumList:[{num:6,name:6},{num:9,name:9},{num:11,name:11},{num:19,name:19},{num:33,name:33},{num:52,name:52},{num:66,name:66},{num:99,name:99}]
+      flowerNumList:[{num:9,name:9},{num:11,name:11},{num:16,name:16},{num:33,name:33},{num:52,name:52},{num:66,name:66},{num:99,name:99}]
     };
   },
   onLoad (option) {
@@ -150,6 +152,9 @@ export default {
     }
   },
   methods: {
+    setNum(num){
+      this.form.flowerNum = num
+    },
     imgUploadSuccess(res) {
       var imgReturn = JSON.parse(res.data)
       if(imgReturn.code == 1){
@@ -177,10 +182,6 @@ export default {
         }
       });
     },
-    changeNumFn(e){
-        this.numSelectedData = this.flowerNumList[e.detail.value]
-        this.form.flowerNum = this.numSelectedData.num
-    },
     changeKindFn(e) {
         this.kindSelectedData = this.kindListData[e.detail.value];
         this.form.kindId = this.kindSelectedData.id;

+ 1 - 1
hdApp/src/components/app-delivery.vue

@@ -32,7 +32,7 @@
       <tui-list-cell class="line-cell" :hover="false">
         <view class="tui-title required">订花人姓名</view>
         <input v-model="form.bookName" placeholder-class="phcolor" placeholder-style="color:#ccc;" style="width:282upx;" class="tui-input" name="bookName" placeholder="请填写姓名" />
-        <button class="admin-button-com default mini-btn" @click="form.bookName='游客'" style="margin-right:10upx;">填"游客"</button>
+        <button class="admin-button-com default middle" @click="form.bookName='游客'" style="margin-right:10upx;">填"游客"</button>
       </tui-list-cell>
 
       <tui-list-cell class="line-cell" :hover="false">

+ 2 - 2
开发/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "批发进销存及财务管理系统",
-    "versionName" : "1.1.08",
-    "versionCode" : 1108,
+    "versionName" : "1.1.09",
+    "versionCode" : 1109,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

+ 2 - 2
开发/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "1.4.4",
-    "versionCode" : 144,
+    "versionName" : "1.4.5",
+    "versionCode" : 145,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

+ 2 - 2
线上/ghsApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "销花宝",
     "appid" : "__UNI__BD781B0",
     "description" : "批发进销存及财务管理系统",
-    "versionName" : "1.1.08",
-    "versionCode" : 1108,
+    "versionName" : "1.1.09",
+    "versionCode" : 1109,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {

+ 2 - 2
线上/hdApp/src/manifest.json

@@ -2,8 +2,8 @@
     "name" : "花掌柜",
     "appid" : "__UNI__4079DC1",
     "description" : "花店管家婆",
-    "versionName" : "1.4.4",
-    "versionCode" : 144,
+    "versionName" : "1.4.5",
+    "versionCode" : 145,
     "transformPx" : true,
     /* 5+App特有相关 */
     "app-plus" : {