shish 2 сар өмнө
parent
commit
edc88988ec

+ 17 - 0
ghsApp/src/admin/billing/affirm.vue

@@ -1087,6 +1087,23 @@ export default {
       }
       params = { ...params, xj: JSON.stringify(xj) };
 
+      //株数
+      let treeData = null;
+      if (this.option && this.option.customId) {
+        treeData = uni.getStorageSync('tree' + this.option.customId);
+        if (!this.$util.isEmpty(treeData)) {
+          treeData = treeData.map((treeItem) => {
+            let list = treeItem.list ? treeItem.list.filter((item) => {
+              return !this.$util.isEmpty(item.num) && Number(item.num) > 0;
+            }) : [];
+            return { ...treeItem, list: list };
+          }).filter((treeItem) => {
+            return !this.$util.isEmpty(treeItem.list);
+          });
+        }
+      }
+      params = { ...params, treeData: JSON.stringify(treeData) };
+
       uni.showLoading({ mask: true });
       Fn(params).then((res) => {
         uni.hideLoading();

+ 18 - 4
ghsApp/src/admin/item/add.vue

@@ -164,6 +164,16 @@
           <input v-model="form.inTurn" placeholder-class="phcolor" class="tui-input" name="inTurn" @focus="form.inTurn=''" placeholder="请填写数字" type="number" />
         </tui-list-cell>
 
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">类型</view>
+            <view>
+              <button class="admin-button-com mini-btn" :class="form.kind == 0 ? 'blue' : 'default'" @click="kindChange(0)">鲜花</button>
+              <button class="admin-button-com mini-btn" :class="form.kind == 1 ? 'blue' : 'default'" @click="kindChange(1)">绿植</button>
+              <button class="admin-button-com mini-btn" :class="form.kind == 2 ? 'blue' : 'default'" @click="kindChange(2)">苗木(筛)</button>
+              <button class="admin-button-com mini-btn" :class="form.kind == 3 ? 'blue' : 'default'" @click="kindChange(3)">苗木(穴)</button>
+            </view>
+          </tui-list-cell>
+
       </view>
 
       <view class="app-footer">
@@ -236,9 +246,9 @@ export default {
         price:'',
         skPrice:'',
         hjPrice:'',
-        skMore:6,
-        addPrice:3,
-        hjAddPrice:2,
+        skMore:0,
+        addPrice:0,
+        hjAddPrice:0,
         hjDiscountPrice:0,
         discountPrice:0,
         skDiscountPrice:0,
@@ -253,7 +263,8 @@ export default {
         virtualStock:0,
         ratioType:0,
         inTurn:100,
-        cpInfo:[]
+        cpInfo:[],
+        kind:0
       },
       itemClassSelectedData:{},
       itemClassData:[],
@@ -326,6 +337,9 @@ export default {
         that.$forceUpdate()
       })
     },
+    kindChange(kind){
+      this.form.kind = kind
+    },
     changeClass(){
       this.$refs.classRef.open('center')
     },

+ 18 - 4
ghsApp/src/admin/item/copy.vue

@@ -168,6 +168,16 @@
             <input v-model="form.inTurn" placeholder-class="phcolor" class="tui-input" name="inTurn" @focus="form.inTurn=''" placeholder="请填写数字" type="number" />
           </tui-list-cell>
 
+          <tui-list-cell class="line-cell" :hover="false">
+            <view class="tui-title">类型</view>
+            <view>
+              <button class="admin-button-com mini-btn" :class="form.kind == 0 ? 'blue' : 'default'" @click="kindChange(0)">鲜花</button>
+              <button class="admin-button-com mini-btn" :class="form.kind == 1 ? 'blue' : 'default'" @click="kindChange(1)">绿植</button>
+              <button class="admin-button-com mini-btn" :class="form.kind == 2 ? 'blue' : 'default'" @click="kindChange(2)">苗木(筛)</button>
+              <button class="admin-button-com mini-btn" :class="form.kind == 3 ? 'blue' : 'default'" @click="kindChange(3)">苗木(穴)</button>
+            </view>
+          </tui-list-cell>
+
       </view>
 
       <view class="app-footer">
@@ -240,10 +250,10 @@ export default {
         price:'',
         skPrice:'',
         hjPrice:'',
-        skMore:6,
+        skMore:0,
         inTurn:100,
-        addPrice:3,
-        hjAddPrice:2,
+        addPrice:0,
+        hjAddPrice:0,
         discountPrice:0,
         skDiscountPrice:0,
         hjDiscountPrice:0,
@@ -256,7 +266,8 @@ export default {
         itemId:0,
         smallRatio:1,
         ratioType:0,
-        cpInfo:[]
+        cpInfo:[],
+        kind:0
       },
       itemClassData:[],
       unitData:[],
@@ -412,6 +423,9 @@ export default {
     statusChange(e){
       this.form.status = e.detail.value ? 1 : 2;
     },
+    kindChange(kind){
+      this.form.kind = kind
+    },
     ratioTypeChange(e){
       this.form.ratioType = e.detail.value
     },

+ 7 - 1
ghsApp/src/admin/item/detail.vue

@@ -273,6 +273,11 @@
             </view>
           </tui-list-cell>
 
+          <tui-list-cell class="line-cell" :hover="false" v-if="productData.id && productData.id>0">
+            <view class="tui-title">类型</view>
+            <view>{{form.kind == 0 ?'鲜切花':form.kind==1?'绿植':form.kind==2?'苗木(筛)':'苗木(穴)'}}</view>
+          </tui-list-cell>
+
       </view>
 
       <view class="app-footer">
@@ -507,7 +512,8 @@ export default {
         virtualStock:0,
         ratioType:0,
         inTurn:100,
-        cpInfo:[]
+        cpInfo:[],
+        kind:0
       },
       itemClassData:[],
       unitData:[],