拆散功能

ghsApp/src/admin/home/workbench.vue

@@ -190,7 +190,7 @@ export default {
 				{ name: "改价", img: 'ghs/home/gj.png', url: "/admin/changePrice/list" },
 				{ name: "花材", img: 'ghs/home/hcgl.png', url: "/admin/item/list" },
 				{ name: "采购", img: 'ghs/home/icon_caigou.png', url: "/pagesPurchase/order" },
-				{ name: "供货商", img: 'ghs/home/icon_ghs.png', url: "/pagesPurchase/supplier" },
+				{ name: "拆散", img: 'ghs/home/kcyjs.png', url: "/admin/part/list" },
 				{ name: "损耗", img: 'ghs/home/kcyjs.png', url: "/admin/breakage/list" },
 				{ name: "调拨入库", img: 'ghs/home/dbrk.png', url: "/pagesStorehouse/allot/allotPut" },
 				{ name: "调拨出库", img: 'ghs/home/dbck.png', url: "/pagesStorehouse/allot/allotEx" },

ghsApp/src/admin/part/confirm.vue

@@ -0,0 +1,410 @@
+<template>
+<view class="app-content">
+  <view class="affirm-page">
+    <view class="affirm-view overscroll">
+      <form>
+        <view class="module-com">
+          <view class="commodity-view">
+            <view class="commodity-list">
+              <view class="commodity-item" v-for="(item, index) in selectList" :key="index">
+                <image class="item-icon" :src="item.cover" alt="商品图" />
+                <view class="item-info">
+                  <view class="info-line">
+                    <text class="item-name">{{ item.itemName }}</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>
+                    </text>
+                  </view>
+                  <view class="info-line">
+                    <text class="item-type"></text>
+                    <text class="item-count">
+                    </text>
+                  </view>
+                </view>
+              </view>
+            </view>
+            <view class="summary-bar">
+              <view class="operate-view" @click="gobackEvent">
+                <text class="iconfont icongouwuche"></text>
+                返回修改
+              </view>
+              <view class="describe-view">
+                共{{ selectList.length }}种
+              </view>
+            </view>
+          </view>
+        </view>
+        <!-- 登录信息 -->
+        <view class="module-com input-line-wrap">
+
+          <tui-list-cell class="line-cell" :hover="false" :arrow="false">
+            <view class="tui-title">备注</view>
+						<input type="text" v-model="form.remark" placeholder="选填"/>
+					</tui-list-cell>
+          
+        </view>
+      </form>
+    </view>
+    <view class="under-bar">
+      <view class="price-view"></view>
+      <button class="admin-button-com blue big" @click="affirmFormSubmit">提交</button>
+    </view>
+
+  </view>
+</view>
+</template>
+
+<script>
+import TuiListCell from "@/components/plugin/list-cell";
+import AppAvatarModule from "@/components/module/app-avatar";
+import SimpleAddress from "@/components/plugin/simple-address";
+import AppAreaSel from "@/components/app-area-sel";
+import productMins from "@/mixins/product";
+import appFormRadioBtn from "@/components/app-formRadio-btn";
+import appAddressGroup from "@/components/app-address-group";
+import appSendTime from "@/components/app-send-time";
+import appFormSend from "@/components/app-form-send";
+import { partItem } from "@/api/part";
+import { mapActions, mapGetters } from "vuex";
+export default {
+  name: "confirm",
+  components: {
+    TuiListCell,
+    AppAvatarModule,
+    SimpleAddress,
+    AppAreaSel,
+    appFormRadioBtn,
+    appAddressGroup,
+    appSendTime,
+    appFormSend,
+  },
+  mixins: [productMins],
+  data () {
+    return {
+      autoLoad: false,
+      isBilling: false,
+			payWayList:[{name:"微信",id:0},{name:"支付宝",id:1},{name:"现金",id:4},{name:"银行卡",id:5}],
+			payWayindex:0,
+      form: {
+        debt: 1,
+        shopId: "",
+        shopName: "",
+        receiveProvince: "",
+        receiveCity: "",
+        receiveFloor: "",
+        receiveAddress: "",
+        receiveLong: "",
+        receiveLat: "",
+        sendType: 2,
+        sendSide: "2",
+        sendDate: "",
+        sendTime: "",
+        sendCost: "",
+        customId: "",
+        product: "",
+        remark:"",
+        payWay:0,
+        needPrint:1,
+      },
+      money: "",
+      showCustomer: false,
+			selectJobType: "part",
+    };
+  },
+  onLoad (option) {
+    if (!this.getMerchantInfo) {
+      this.initMerchantInfo().then((data) => {
+        uni.setNavigationBarTitle({
+          title: data.name,
+        });
+      });
+    } else {
+      uni.setNavigationBarTitle({
+        title: this.getMerchantInfo.name,
+      });
+    }
+    this.courier(2);
+    if(option.customId){
+      this.form.customId = option.customId
+    }
+    if(option.customName){
+      this.form.customName = option.customName
+    }
+  },
+	onShow(){
+		if(!this.$util.isEmpty(uni.getStorageSync("newClient"))){
+			this.showCustomer = true;
+		}
+	},
+	onUnload(){
+			uni.removeStorageSync('newClient');
+	},
+  computed: {
+    ...mapGetters(["getMerchantInfo", "getLoginInfo"]),
+  },
+  methods: {
+    ...mapActions(["initMerchantInfo"]),
+    init () {
+      this._getDet();
+    },
+		payWayChange(e){
+			let index = e.detail.value
+			this.payWayindex = index
+      this.form.payWay = this.payWayList[index].id
+		},
+    setPayWay(payWay){
+      this.form.payWay = payWay
+    },
+    courier (type) {
+      this.form.sendType = type;
+      if (type === 2) {
+        this.form.sendCost = "";
+      } else if(type == 1){
+        this.form.sendCost = this.money;
+      }
+    },
+    sendCostBlur () {
+      if (this.form.sendType === 1) {
+        this.money = this.form.sendCost;
+      }
+    },
+    _getDet () {
+      let data = uni.getStorageSync("modifyShopB");
+      if (this.$util.isEmpty(data)) return;
+      Object.keys(this.form).forEach((i, index) => {
+        this.form[i] = data[i];
+      });
+    },
+    changeCustomerFn (info) {
+      const product = this.selectList.map((ele) => {
+        return {
+          productId: ele.id,
+          bigNum: ele.bigCount,
+          smallNum: ele.smallCount,
+          classId: ele.classId,
+          itemId: ele.itemId,
+        };
+      });
+      let params = {
+        customId: info.id,
+        product: JSON.stringify(product),
+        province: info.province,
+        city: info.city,
+        address: info.address,
+        floor: info.floor,
+        long: info.long,
+        lat: info.lat,
+      };
+      this.form.sendCost = '';
+      this.form.customId = info.id;
+      this.form.customName = info.name;
+    },
+    affirmFormSubmit () {
+      let that = this
+      let product = this.selectList.map((ele) => {
+        return {
+          productId: ele.id,
+          bigNum: ele.bigCount,
+          smallNum: ele.smallCount,
+          classId: ele.classId,
+          itemId: ele.itemId
+        };
+      });
+      that.$util.confirmModal({content:'确认拆散？'},() => {
+          partItem({product:JSON.stringify(product),remark:that.form.remark}).then((res) => {
+            //删除记忆
+            that.removeFromSaveDirect()
+            const {data: { id, orderSn },} = res;
+            that.pageTo({url: '/admin/part/result',type:2})
+          });
+      })
+    },
+    gobackEvent () {
+      this.pageTo({url: '/admin/part/index',type:2})
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.admin-button-com {
+  margin-right: 20upx;
+}
+.affirm-page {
+  position: relative;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .affirm-view {
+    flex: 1;
+    margin-bottom:90upx;
+    padding: 20upx;
+    background-color: #f0f2f6;
+
+    .commodity-view {
+      display: flex;
+      flex-direction: column;
+      .commodity-list {
+        padding: 20upx;
+        .commodity-item {
+          display: flex;
+          margin-bottom: 20upx;
+          .item-icon {
+            flex-shrink: 0;
+            width: 140upx;
+            height: 140upx;
+          }
+          .item-info {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            flex: 1;
+            margin-left: 20upx;
+            .info-line {
+              margin-bottom: 20upx;
+              display: flex;
+              justify-content: space-between;
+              align-items: flex-end;
+              .item-name {
+                color: #666;
+                font-size: 28upx;
+              }
+              .item-price {
+                color: #333;
+                font-size: 22upx;
+                .price {
+                  font-size: 32upx;
+                  font-weight: bold;
+                }
+              }
+              .item-type {
+                color: #999;
+                font-size: 24upx;
+              }
+              .item-count {
+                color: #666;
+                font-size: 24upx;
+              }
+            }
+          }
+        }
+      }
+      .summary-bar {
+        padding: 0 20upx;
+        height: 90upx;
+        display: flex;
+
+        align-items: center;
+        justify-content: space-between;
+        border-top: 1upx solid #eeeeee;
+        .operate-view {
+          display: flex;
+          align-items: center;
+          color: #3385ff;
+          font-size: 30upx;
+          font-weight:bold;
+          .iconfont {
+            margin-right: 20upx;
+            font-size: 40upx;
+          }
+        }
+        .describe-view {
+          display: flex;
+
+          align-items: center;
+          color: #333;
+          font-size: 24upx;
+          .price {
+            font-weight: bold;
+            font-size: 36upx;
+          }
+        }
+      }
+    }
+
+    .module-com {
+      background-color: #fff;
+      margin-bottom: 20upx;
+      border-radius: 10upx;
+      overflow: hidden;
+					.tab-box{
+						padding: 10upx 30upx 30upx;
+						.tab{
+							width: 49%;
+							height: 70upx;
+							color: #a2a2a2;
+							border: 1upx solid #dcdcdc;
+							border-radius: 10upx;
+							font-size: 28upx;
+							font-weight: 700;
+							&.active{
+								color: #ff4d4d;
+								border: 1upx solid #ff4d4d;
+							}
+						}
+					}
+      .member-wrap {
+        .member-det {
+          font-size: 24upx;
+          margin-left: 20upx;
+        }
+      }
+      .remark-wrap {
+        align-items: flex-start;
+        .remark {
+          height: 240upx;
+        }
+      }
+      // .tui-placeholder,
+      // .tui-input {
+      // 	padding-right: 30upx;
+      // 	width: 100%;
+      // 	text-align: right;
+      // }
+    }
+  }
+  .under-bar {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 20upx;
+    position: fixed;
+    bottom:0;
+    /* 手机mobile屏幕小于1000px */
+    @media screen and (max-width: 1100px) {
+      width: 100%;
+    }
+    /* 收银台cashier屏幕大于1000px */
+    @media screen and (min-width:1100px) {
+      width: 40%;
+    } 
+    height: 100upx;
+    background-color: #fff;
+
+    box-shadow: 0upx -1upx 6upx 0upx rgba(4, 0, 0, 0.06);
+    .price-view {
+      display: flex;
+      align-items: center;
+      font-size: 24upx;
+      .price-title {
+        color: #333;
+      }
+      .price-number {
+        margin: 0 20upx;
+        color: #ff2842;
+        .large {
+          font-size: 40upx;
+        }
+      }
+    }
+    .admin-button-com {
+      width: 200upx;
+    }
+  }
+}
+</style>

ghsApp/src/admin/part/index.vue

@@ -0,0 +1,259 @@
+<template>
+<view class="app-content">
+	<view class="billing_box_bg">
+		<view class="input-wrap" >
+			<view class="search-bar">
+				<app-search-module v-model="py" placeholder="输入拼音首字母搜索" @input="searchFn" />
+			</view>
+			<view style="float:right">
+				<button class="admin-button-com middle blue" @click="removeFromSave(0)">清除花材</button>
+			</view>
+		</view>
+		
+		<view class="scroll-middle_bx">
+
+			<scroll-view scroll-y scroll-with-animation class="tab-view">
+				<!--分类 start -->
+				<div v-for="(item, index) in globalClassItemList" :key="index" class="tab-bar-item" :class="classIndex == index ? 'active' : ''" :data-current="index" @tap.stop="swichClass(index)">
+					<text>{{ item.className || "" }}</text>
+				</div>
+				<!--分类 end -->
+				<view style="height: 120upx"></view>
+			</scroll-view>
+
+			<scroll-view scroll-y class="right-box" :scroll-into-view="scroll_into_view" scroll-with-animation="true" @scroll="scroll_detail" lower-threshold="100" @scrolltolower="scroll_bottom">
+				<!--花材列表 start -->
+				<block v-if="!$util.isEmpty(globalClassItemList)">
+					<view class="item_list_bx selectAll" v-for="(classItem, classIndex) in globalClassItemList" :key="classIndex" :id="`class_${classIndex}`">
+						<view class="item_list_title">{{ classItem.className }}</view>
+
+						<view v-if="classItem.child && !$util.isEmpty(classItem.child)">
+
+							<template v-for="(productItem, productIndex) in classItem.child">
+								<view style="height: 160upx" :id="`class_${classItem.classId}_${productItem.id}`" :key="productIndex">
+									<Commondity v-if="classItem.isActive"
+										:checkStock="true"
+										:info="productItem"
+										@showAddModelFn="showAddModelFn"
+										@replaceItemFn="replaceItemFn"
+									></Commondity>
+								</view>
+							</template>
+
+						</view>
+						<view v-else>
+							<view style="height:260upx;text-align:center;color:#CCCCCC;position: relative;">
+								<view style="position: absolute;margin:auto;top:130upx;left:0;right:0;bottom:0;">暂无花材</view>
+							</view>
+						</view>
+
+					</view>
+				</block>
+				<block v-else>
+					<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(globalClassItemList)" />
+				</block>
+				<!--花材列表 end -->
+			</scroll-view>
+
+		</view>
+		
+		<modal-module :show="isAddModel" @cancel="addItemModelHidden" @click="confirmAddItemModel" :title="customData.itemName" 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?parseFloat(customData.stock):0 }}</text></view>
+					<view class="num_bx"> 
+
+						<!-- #ifdef APP-PLUS -->
+						<input style="width: 260upx" v-model="customData.bigCount" v-if="globalUnitType == 0" type="number" />
+						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 0">{{customData.bigUnit}}</text>
+						<input style="width: 260upx" v-model="customData.smallCount" v-if="globalUnitType == 1" type="number" />
+						<text style="font-size:35upx;font-weight:bold;color:#666666;" v-if="globalUnitType == 1">{{customData.smallUnit}}</text>
+						<!-- #endif -->
+						<!-- #ifdef MP-WEIXIN -->
+						<input style="width: 260upx" 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">{{customData.bigUnit}}</text>
+						<input style="width: 260upx" 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">{{customData.smallUnit}}</text>
+						<!-- #endif -->
+
+					</view>
+				</view>
+			</template>
+		</modal-module>
+
+		<!-- 花材不足提示框 -->
+		<modal-module :show="showSubmitModel" title="确认下一步？" color="#333" :size="32" padding="30rpx 30rpx" >
+		</modal-module>
+		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmToSave" ></FooterCart>
+	</view>
+</view>
+</template>
+
+<script>
+import AppSearchModule from "@/components/module/app-search";
+import AppTabs from "@/components/plugin/tabs";
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import Commondity from "@/components/module/app-commodity";
+import FooterCart from "@/components/module/app-footer-cart";
+import ModalModule from "@/components/plugin/modal";
+import { COMMODITY_TYPE } from "@/utils/declare";
+import productMins from "@/mixins/product";
+export default {
+	name: "index",//拆散
+	components: {
+		AppTabs,
+		AppSearchModule,
+		AppWrapperEmpty,
+		Commondity,
+		ModalModule,
+		FooterCart,
+	},
+	mixins: [productMins],
+	data() {
+		return {
+			selectJobType: "part",
+			COMMODITY_TYPE,
+			isAddModel: false,
+			isSmallCount:false,
+			checkStock:true,
+			customData: {
+				bigCount: 0,
+				smallCount: 0,
+				userPrice:0
+			},
+			showSubmitModel: false
+		};
+	},
+	computed: {
+	},
+	onUnload() {
+	},
+	methods: {
+		confirmToSave() {
+			if(this.$util.isEmpty(this.selectList)){
+				this.$msg('请选择花材')
+				return false
+			}
+			this.$util.pageTo({ url: "/admin/part/confirm",type:2})
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.billing_box_bg {
+	height: 100%;
+	background: white;
+	display: flex;
+	flex-direction: column;
+	.input-wrap {
+		padding: 22upx 20upx 22upx 30upx;
+		.search-bar {
+			display:inline-block;
+			width:530upx;
+		}
+	}
+	.scroll-middle_bx {
+		flex: 1;
+		display: flex;
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+	}
+	.tab-view {
+		position: relative;
+		height: calc(100vh - 140upx);
+		width: 170upx;
+		flex-shrink: 0;
+		background-color: #f0f2f6;
+		.tab-bar-item {
+			position: relative;
+			width: 170upx;
+			height: 90upx;
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 26upx;
+			color: #444;
+			font-weight: 400;
+			.tag {
+				display: flex;
+				padding: 0 20upx;
+				align-items: center;
+				position: absolute;
+				right: 0;
+				top: 0;
+				height: 32upx;
+				background: #ff2842;
+				border-radius: 16upx;
+				color: #fff;
+				font-size: 20upx;
+			}
+      &:last-child{
+        margin-bottom: 110upx;
+      }
+		}
+		.active {
+			position: relative;
+			color: $mainColor;
+			font-size: 26upx;
+			background: #fff;
+		}
+		.active::before {
+			content: "";
+			position: absolute;
+			border-left: 8upx solid $mainColor;
+			height: 100%;
+			left: 0;
+		}
+	}
+	.right-box {
+		height: calc(100vh - 140upx);
+		flex: 1;
+		box-sizing: border-box;
+	}
+	.item_list_bx {
+		padding: 40upx 16upx;
+		//padding: 0 16upx;
+    &:last-child{
+      margin-bottom: 70upx;
+    }
+	}
+	.item_list_title {
+		margin-bottom: 20upx;
+		font-size: 24upx;
+		font-weight: 600;
+		color: #666666;
+	}
+	.select-cmd_bx {
+		& .kc {
+			color: #999999;
+			font-size: 28upx;
+			font-weight: 400;
+			margin-bottom: 40upx;
+			text-align: center;
+			margin-top: 30upx;
+			.unit_price{
+				padding-right:25upx;
+			}
+		}
+		& .num_bx {
+			display: flex;
+			align-items: center;
+			margin-bottom: 40upx;
+			justify-content:center;
+			padding-left:70upx;
+			& > input {
+				width: 212upx;
+				height: 80upx;
+				border: 1upx solid #dddddd;
+				border-radius: 4upx;
+				text-align: center;
+				margin-right: 24upx;
+				font-size: 40upx;
+			}
+		}
+	}
+}
+</style>

ghsApp/src/admin/part/info.vue

@@ -0,0 +1,322 @@
+<template>
+	<view class="app-content">
+		<view v-if="!$util.isEmpty(detailInfo)" class="info-content_box">
+			<view class="title">单据信息</view>
+			<view class="bills-info_box content-box">
+				<view class="order-info_box">
+					<view>订单日期：</view>
+					<view>{{ detailInfo.addTime }}</view>
+				</view>
+				<view class="order-info_box">
+					<view>订单编码：</view>
+					<view>{{ detailInfo.orderSn }}</view>
+					<view class="price">
+						<button @click="copy(detailInfo.orderSn)" class="admin-button-com default">复制</button>
+					</view>
+				</view>
+				<view class="order-info_box">
+					<view>拆散人员：</view>
+					<view>{{ detailInfo.shopAdminName }}</view>
+				</view>
+			</view>
+			<view class="title"> 花材信息 </view>
+			<view class="module-com content-box">
+				<view class="commodity-view">
+					<view class="commodity-list">
+						<view v-for="(s, idx) in itemList" :key="idx" class="commodity-item" >
+							<image class="item-icon" :src="s.cover" />
+							<view class="item-info">
+								<view class="info-line">
+									<text class="item-name">{{ s.name }}</text>
+									<text class="item-price">
+										<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.itemCost?parseFloat(s.itemCost):0 }}</text>
+									</text>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="summary-bar">
+						<view class="operate-view" ></view>
+						<view class="describe-view">
+							共{{ itemList.length || 0 }}种，
+							<text>{{ detailInfo.num }}扎</text>，
+							<text>¥{{ detailInfo.cost?parseFloat(detailInfo.cost):0}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="content-box price-detail">
+				<div class="module-com input-line-wrap">
+					<tui-list-cell class="line-cell" :hover="false">
+						<div class="tui-title">备注</div>
+						<input :disabled="true" v-model="detailInfo.remark" placeholder-class="phcolor" class="tui-input" name="name" type="text" />
+					</tui-list-cell>
+				</div>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+import { getPartFullInfo } from "@/api/part";
+import productMins from "@/mixins/product";
+import TuiListCell from "@/components/plugin/list-cell";
+export default {
+	name: "info",
+	components: {
+		TuiListCell
+	},
+	mixins: [productMins],
+	data() {
+		return {
+			selectJobType: "info",
+			autoLoad: false,
+			stepActive: 0,
+			form: {
+				name: ""
+			},
+			detailInfo: {},
+			itemList:[],
+			loading: false
+		};
+	},
+	methods: {
+		copy(val) {
+			const self = this;
+			uni.setClipboardData({
+				data: val,
+				success: function() {
+					self.$msg("复制成功");
+				}
+			});
+		},
+		callUp(mobile) {
+			uni.makePhoneCall({
+				phoneNumber: mobile
+			});
+		},
+		async init() {
+			const { orderSn } = this.option
+			if (!orderSn) {
+				return
+			}
+			const { data } = await getPartFullInfo({orderSn:orderSn})
+			this.detailInfo = data.info
+			this.itemList = data.itemList
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.info-content_box {
+	padding: 0 20upx 100upx;
+	& > .title {
+		color: #666666;
+		font-size: 28upx;
+		font-weight: 600;
+		padding: 30upx 3upx;
+	}
+	& .address-des_bx {
+		display: flex;
+		padding: 20upx 10upx 30upx 20upx;
+		& > view:nth-child(1) {
+			flex: 1;
+			margin-top: 10upx;
+			& > view:nth-child(1) {
+				color: #333333;
+				font-size: 32upx;
+				font-weight: bold;
+			}
+			& > view:nth-child(2) {
+				color: #666666;
+				font-size: 28upx;
+				font-weight: 400;
+				margin-top: 20upx;
+			}
+		}
+		& > view:nth-child(2) {
+			display: flex;
+			& .icondianhua1 {
+				font-size: 50upx;
+				color: #3385ff;
+				margin-left: 0upx;
+			}
+		}
+	}
+	.bills-info_box {
+		padding: 30upx 20upx 30upx;
+		& > .order-info_box {
+			display: flex;
+			align-items: center;
+			font-size: 26upx;
+			font-weight: 400;
+			margin-bottom: 5upx;
+			& > view:nth-child(1) {
+				color: #999999;
+				width: 135upx;
+				text-align: right;
+			}
+			& > view:nth-child(2) {
+				color: #333333;
+			}
+			& > .price {
+				flex: 1;
+				font-size: 30upx;
+				color: #333333;
+				display: flex;
+				align-items: center;
+				justify-content: flex-end;
+				& .iconxiangyou {
+					color: #999999;
+					font-size: 25upx;
+					margin-left: 12upx;
+				}
+			}
+		}
+	}
+	.content-box {
+		background-color: #ffffff;
+		border-radius: 10upx;
+	}
+	.commodity-view {
+		display: flex;
+		flex-direction: column;
+		.commodity-list {
+			padding: 20upx;
+			.commodity-item {
+				display: flex;
+				margin-bottom: 20upx;
+				.item-icon {
+					flex-shrink: 0;
+					width: 140upx;
+					height: 140upx;
+				}
+				.item-info {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					flex: 1;
+					margin-left: 20upx;
+					.info-line {
+						margin-bottom: 20upx;
+						display: flex;
+						justify-content: space-between;
+						align-items: flex-end;
+						.item-name {
+							color: #333333;
+							font-size:30upx;
+							font-weight:bold;
+						}
+						.item-price {
+							color: #333;
+							font-size: 22upx;
+							.price {
+								font-size: 32upx;
+								font-weight: bold;
+							}
+						}
+						.item-type {
+							color: #999;
+							font-size: 24upx;
+						}
+						.item-count {
+							color: #666;
+							font-size: 24upx;
+						}
+					}
+				}
+			}
+		}
+		.summary-bar {
+			padding: 0 20upx;
+			height: 90upx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border-top: 1upx solid #eeeeee;
+			.operate-view {
+				display: flex;
+
+				align-items: center;
+				color: #3385ff;
+				font-size: 26upx;
+				.iconfont {
+					margin-right: 20upx;
+					font-size: 40upx;
+				}
+			}
+			.describe-view {
+				display: flex;
+
+				align-items: center;
+				color: #333;
+				font-size: 24upx;
+				.price {
+					font-weight: bold;
+					font-size: 36upx;
+				}
+			}
+		}
+	}
+	.shipping-address {
+		display: flex;
+		align-items: center;
+		margin-top: 20upx;
+		& > view:nth-child(1) {
+			color: #999999;
+			font-size: 28upx;
+			font-weight: 400;
+			display: inline-block;
+			padding: 30upx 0 30upx 20upx;
+			flex: 1;
+			& > text {
+				color: #333333;
+				font-weight: 600;
+			}
+		}
+		& > view:nth-child(2) {
+			font-size: 60upx;
+			color: #d6e7ff;
+			margin-right: 10upx;
+		}
+	}
+	.price-detail {
+		margin-top: 20upx;
+		margin-bottom: 20upx;
+	}
+	.detail-price_box {
+		color: #333333;
+		font-size: 22upx;
+		text-align: right;
+		flex: 1;
+		font-weight: 600;
+		&.red {
+			color: #ff2842;
+		}
+	}
+}
+.app-footer {
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+	& .admin-button-com {
+		padding: 0;
+		margin-right: 15upx;
+		width: 140upx;
+		height: 70upx;
+		line-height: 70upx;
+		text-align: center;
+		color: #3385ff;
+		border: 1upx solid #3385ff;
+		&.active{
+			color: #666666;
+			border: 1upx solid #ccc;
+		}
+	}
+}
+</style>

ghsApp/src/admin/part/list.vue

@@ -0,0 +1,103 @@
+<template>
+  <div class="app-content">
+			<block v-if="!$util.isEmpty(list.data)">
+				<navigator class="flex-space list" v-for="(item, index) in list.data" :key="index" :url="`/admin/part/info?orderSn=${item.orderSn}`" >
+				<view class="label">
+					<text>日期：{{item.addTime.substr(5,11)}}</text>
+					<text>单号：{{item.orderSn}}</text>
+          <text>来源：{{item.ptStyle == 1 ? '零售':'批发'}}</text>
+					<text>操作：{{item.shopAdminName}}</text>
+				</view>
+				<view class="flex val">
+          <text>{{item.num?parseFloat(item.num):0}}扎</text>
+          <view class="iconfont iconxiangyou"></view>
+        </view>
+			</navigator>
+			</block>
+			<block v-else>
+				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
+			</block>
+      <view class="app-footer open_btn">
+        <view @click="selectProduct" class="admin-button-com big blue">新增拆散</view>
+      </view>
+  </div>
+</template>
+
+<script>
+
+import { list } from "@/mixins";
+import { partList } from "@/api/part";
+export default {
+  name: "breakage-list",
+  components: {},
+  mixins: [list],
+  data() {
+    return {
+    };
+  },
+  onPullDownRefresh() {
+    this.resetList();
+    this.getPartList().then((res) => {
+      uni.stopPullDownRefresh();
+    });
+  },
+  onReachBottom() {
+    if (!this.list.finished) {
+      this.getPartList().then((res) => {
+        uni.stopPullDownRefresh();
+      });
+    } else {
+      uni.stopPullDownRefresh();
+    }
+  },
+  mounted() {
+  },
+  onLoad(option) {
+  },
+  onShow() {
+  	this.resetList();
+    this.getPartList();
+  },
+  methods: {
+    init(){
+
+    },
+    selectProduct(){
+      this.$util.pageTo({url: '/admin/part/index'})
+    },
+    getPartList() {
+      return partList({
+        page: this.list.page,
+      }).then((res) => {
+        this.completes(res);
+        if (this.$util.isEmpty(res.data)){
+          return false
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+	.app-content{
+		.list{
+			padding: 20upx 30upx;
+			margin-bottom: 20upx;
+			background: #FFFFFF;
+			.label{
+				line-height: 50upx;
+				text{
+					display: block;
+				}
+			}
+			.val{
+				font-size:30upx;
+        font-weight:bold;
+				.iconfont{
+					margin-left: 12upx;
+					color: #999999;
+				}
+			}
+		}
+	}
+</style>

ghsApp/src/admin/part/result.vue

@@ -0,0 +1,73 @@
+<template>
+	<view class="app-content">
+		<view class="billing_box_bg">
+			<view class="top-view"> </view>
+			<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>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+    name: "success",
+	methods: {
+		init(){
+
+		},
+		goBackHome() {
+			uni.navigateBack({})
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.go-back{
+	width: 80%;
+	height: 80upx;
+	color: #FFFFFF;
+	margin-top: 50upx;
+	background: #3385FF;
+	border-radius: 10upx;
+	font-size:30upx;
+}
+.billing_box_bg {
+	position: relative;
+	padding: 60upx 30upx;
+	display: flex;
+	background: white;
+	flex-direction: column;
+    background-color: #f5f5f5;
+	.top-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 299upx;
+		background: #3385ff;
+		border-radius: 0upx 0upx 83upx 83upx;
+	}
+	.result-view {
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 70upx;
+		width: 100%;
+		background: #ffffff;
+		border-radius: 20upx;
+		z-index: 1;
+		.iconchenggong {
+			font-size: 170upx;
+			color: $mainColor1;
+		}
+		.result-title {
+			margin: 50upx 0 70upx;
+			font-size: 32upx;
+		}
+	}
+}
+</style>

ghsApp/src/api/part/index.js

@@ -0,0 +1,13 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+export const partItem = data => {
+	return https.post("/part/part-item", data);
+}
+
+export const partList = data => {
+	return https.get('/part/list', data)
+}
+
+export const getPartFullInfo = data => {
+	return https.get('/part/get-full-info', data)
+}

ghsApp/src/pages.json

@@ -143,6 +143,12 @@
 				{"path": "list","style": {"navigationBarTitleText": "优惠券"}}
 			]
 		},
+		{
+			"root": "admin/part",
+			"pages": [
+				{"path": "list","style": {"navigationBarTitleText": "拆散记录"}}
+			]
+		},
 		{
 			"root": "admin/ad",
 			"pages": [