制作单

ghsApp/src/admin/stat/customSale.vue

@@ -24,9 +24,7 @@
 								<t-td><view>{{item.levelName}}</view></t-td>
 								<t-td><view>{{parseFloat(item.num)}}</view></t-td>
 								<t-td><view>{{parseFloat(item.amount)}}</view></t-td>
-								<t-td>
-									<button class="admin-button-com mini blue change-level" @click="updateLevel(item)">调等级</button>
-								</t-td>
+								<t-td> </t-td>
 							</t-tr>
 						</view>
 

hdApp/src/admin/goods/add.vue

@@ -41,15 +41,16 @@
             <span>自取商品</span>
           </label>
         </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">运费</view>
           <radio-group class="tui-input" @change="freightChange">
             <label class="list" for="customLink">
-              <radio id="customLink" value="0" :checked="form.freightType == 0" style="transform: scale(0.8,0.8);" />
+              <radio id="customLink" value="0" :checked="form.freightType == 0" style="transform: scale(0.7,0.7);" />
               <span class="checkbox-text">按距离收费</span>
             </label>
             <label class="list" for="goodsLink">
-              <radio id="goodsLink" value="1" :checked="form.freightType == 1" style="transform: scale(0.8,0.8);" />
+              <radio id="goodsLink" value="1" :checked="form.freightType == 1" style="transform: scale(0.7,0.7);" />
               <span class="checkbox-text">免运费</span>
             </label>
           </radio-group>
@@ -104,6 +105,21 @@
       </view>
 
       <view class="module-com input-line-wrap goods-wrap">
+
+        <tui-list-cell class="line-cell" v-if="stockModel == 1" :hover="false">
+          <view class="tui-title">使用花材数</view>
+          <radio-group class="tui-input" @change="setItemNumChange">
+            <label class="list" for="setItemNumNotOk">
+              <radio id="setItemNumNotOk" value="0" :checked="form.setItemNum == 0" style="transform: scale(0.7,0.7);" />
+              <span class="checkbox-text">以后再改</span>
+            </label>
+            <label class="list" for="setItemNumOk">
+              <radio id="setItemNumOk" value="1" :checked="form.setItemNum == 1" style="transform: scale(0.7,0.7);" />
+              <span class="checkbox-text">好了，可上架</span>
+            </label>
+          </radio-group>
+        </tui-list-cell>
+
         <view class="module-tit">
           <span>图片</span>
           <span class="app-color-3">（最多4张）</span>
@@ -136,10 +152,11 @@ import TuiListCell from "@/components/plugin/list-cell";
 import AppUploader from "@/components/app-uploader";
 const form = require("@/utils/formValidation.js");
 import { getClass } from "@/api/category";
-import { getDetailB, addB, updateB } from "@/api/goods"
+import { addB } from "@/api/goods"
 //图片上传插件来源：https://ext.dcloud.net.cn/plugin?id=2922 已改造，不能再升级 shish 20211228
 import htzImageUpload from './components/htz-image-upload/htz-image-upload.vue'
 import productMins from "@/mixins/product";
+import {currentShop} from "@/api/shop"
 export default {
   name: "add",
   components: { TuiListCell, AppUploader,htzImageUpload },
@@ -159,10 +176,12 @@ export default {
         shopImg: [],
         briefContent: "",
         status:1,
-        cover:''
+        cover:'',
+        setItemNum:0
       },
       categoryData:[],
-      currentImgData:[]
+      currentImgData:[],
+      stockModel:0
     };
   },
   onLoad() {
@@ -195,6 +214,14 @@ export default {
           this.categoryData = res.data
         }
       })
+      currentShop().then(res=>{
+        let that = this
+        if(res.code == 1){
+            if(res.data && res.data.stockModel){
+              that.stockModel = res.data.stockModel
+            }
+        }
+      })
     },
     confirmFn() {
       let that = this
@@ -254,6 +281,9 @@ export default {
     freightChange(e) {
       this.form.freightType = e.detail.value;
     },
+    setItemNumChange(e){
+      this.form.setItemNum = e.detail.value;
+    },
     // 表单验证
     formSubmit(e) {
       // 表单规则

hdApp/src/admin/goods/detail.vue

@@ -110,10 +110,33 @@
               </view>
             </view>
           </view>
+
+          <template>
+            <view style="text-align:center;">
+                <button class="admin-button-com middle blue" v-if="goodsInfo.setItemNum == 0" style="margin:0 auto;margin-top:10upx;margin-bottom:10upx;" @click="selectItem()">修改花材</button>
+                <button class="admin-button-com middle default" v-else style="margin:0 auto;margin-top:10upx;margin-bottom:10upx;">修改花材</button>
+            </view>
+          </template>
+
         </view>
       </template>
 
       <view class="module-com input-line-wrap goods-wrap">
+
+        <tui-list-cell class="line-cell" v-if="form.flower == 1 && stockModel == 1" :hover="false">
+          <view class="tui-title">使用花材数</view>
+          <radio-group class="tui-input" @change="setItemNumChange">
+            <label class="list" for="setItemNumNotOk">
+              <radio id="setItemNumNotOk" value="0" :checked="form.setItemNum == 0" :disabled="goodsInfo.setItemNum == 1" style="transform: scale(0.7,0.7);" />
+              <span class="checkbox-text">以后再改</span>
+            </label>
+            <label class="list" for="setItemNumOk">
+              <radio id="setItemNumOk" value="1" :checked="form.setItemNum == 1" :disabled="goodsInfo.setItemNum == 1" style="transform: scale(0.7,0.7);" />
+              <span class="checkbox-text">好了，可上架</span>
+            </label>
+          </radio-group>
+        </tui-list-cell>
+
         <view class="module-tit">
           <span>图片</span>
           <span class="app-color-3">（最多4张）</span>
@@ -149,6 +172,7 @@ import { getClass } from "@/api/category";
 import { getDetailB, addB, updateB } from "@/api/goods";
 //图片上传插件来源：https://ext.dcloud.net.cn/plugin?id=2922 已改造，不能再升级 shish 20211228
 import htzImageUpload from './components/htz-image-upload/htz-image-upload.vue'
+import {currentShop} from "@/api/shop"
 export default {
   name: "add",
   components: {
@@ -174,17 +198,35 @@ export default {
         briefContent: "",
         status:1,
         flower:1,
-        flowerNum:0
+        flowerNum:0,
+        setItemNum:0,
       },
-      categoryData:[]
+      categoryData:[],
+      stockModel:0
     };
   },
   onLoad() {
     const token = uni.getStorageSync('token')
     this.headers.token = token
     this.getDetail()
+
+      currentShop().then(res=>{
+        let that = this
+        if(res.code == 1){
+            if(res.data && res.data.stockModel){
+              that.stockModel = res.data.stockModel
+            }
+        }
+      })
+
   },
   methods: {
+    setItemNumChange(e){
+      this.form.setItemNum = e.detail.value;
+    },
+    selectItem(){
+      this.pageTo({url:'/admin/goods/selectItem'})
+    },
     imgDeleteFn(res){
       const index = res.index
       this.form.shopImg.splice(index,1)
@@ -216,7 +258,6 @@ export default {
             this.categoryData = res.data
           }
         })
-
       })
     },
     formSubmit(e) {

hdApp/src/admin/home/apply.vue

@@ -40,6 +40,13 @@ export default {
                 { name: "运费规则", img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`, url: "/admin/goods/freight",pf:1}
             ]
         },
+        {
+          title: '制作单',
+          list: [
+            { name: "制作单", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/list",pf:1},
+            { name: "制作统计", img: `${this.$constant.imgUrl}/ghs/home/kcyjs.png`, url: "/admin/work/statCat",pf:1},
+          ]
+        },
         {
           title: '门店仓库',
           list: [

hdApp/src/admin/shop/add.vue

@@ -19,6 +19,21 @@
 						</label>
 					</radio-group>
 				</tui-list-cell>
+
+				<tui-list-cell class="line-cell" :hover="false">
+					<view class="tui-title">库存控制</view>
+					<radio-group class="tui-input" @change="stockModelChange">
+						<label class="list" for="stockModelZha">
+							<radio id="stockModelZha" value="0" style="transform:scale(0.7,0.7)" :checked="form.stockModel == 0" />
+							<span class="checkbox-text">管到扎</span>
+						</label>
+						<label class="list" for="stockModelZhaZhi">
+							<radio id="stockModelZhaZhi" value="1" style="transform:scale(0.7,0.7)" :checked="form.stockModel == 1" />
+							<span class="checkbox-text">管到支</span>
+						</label>
+					</radio-group>
+				</tui-list-cell>
+
 				<tui-list-cell class="line-cell" :hover="false">
 					<view class="tui-title">营业状态</view>
 					<view><switch style="transform:scale(0.7,0.7)" :checked="form.open == 0 ? false : true" @change="openChange" /></view>
@@ -136,6 +151,7 @@ export default {
 			end_time: '00:00',
 			form: {
 				join:0,
+				stockModel:0,
 				shopName: '',
 				province: '',
 				city: '',
@@ -240,6 +256,9 @@ export default {
 		joinChange(e){
 			this.form.join = e.detail.value
 		},
+		stockModelChange(e){
+			this.form.stockModel = e.detail.value
+		},
 		endTimeChange: function(e) {
 			this.end_time = e.detail.value
 			this.form.openEndTime = e.detail.value

hdApp/src/admin/work/statCat.vue

@@ -0,0 +1,224 @@
+<template>
+<view class="app-content">
+	<view class="ex-page">
+		<view class="input-wrap_box">
+            <view>
+                <AppSearchModule placeholder="输入拼音首字母搜索" @input="searchFn"/>
+            </view>
+		</view>
+		<view class="top-bar">
+			<DateSelect class="bar" top="0" @selectDateFn="selectDateFn" />
+		</view>
+		<view class="main-view">
+			<view class="space-view ex-table">
+				<block>
+					<t-table :headerBackgroundColor="'#F0F2F6'">
+
+						<t-tr header><t-th>名称</t-th><t-th>制作单</t-th><t-th>商品数</t-th><t-th>操作</t-th></t-tr>
+
+						<view v-for="(item, index) in statData" :key="index">
+							<t-tr>
+								<t-td><view>{{item.customName}}</view></t-td>
+								<t-td><view>{{item.levelName}}</view></t-td>
+								<t-td><view>{{parseFloat(item.num)}}</view></t-td>
+
+								<t-td>
+									<button class="admin-button-com mini blue change-level" @click="getDetail(item)">查看明细</button>
+								</t-td>
+							</t-tr>
+						</view>
+
+					</t-table>
+				</block>
+			</view>
+		</view>
+	</view>
+</view>
+</template>
+<script>
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import SelectList from "@/components/plugin/selectList";
+import { list } from "@/mixins";
+import ShopSelect from "@/components/module/shopSelect";
+import DateSelect from "@/components/module/dateSelect";
+import AppSearchModule from "@/components/module/app-search";
+import { getStatWorkCat } from "@/api/stat/index";
+import {mapActions, mapGetters} from "vuex";
+export default {
+	components: { SelectList, AppWrapperEmpty,ShopSelect,AppSearchModule,DateSelect },
+	mixins: [list],
+	computed: {
+
+    },
+	data() {
+		return {
+			isShow:false,
+			customizationTime:[],
+			shopId:'',
+			itemId:'',
+			nowTime: "",
+			showTimeDropdown: false,
+			nowShop: "",
+			showShopDropdown: false,
+			columns: [
+				{
+					name: "姓名",
+					dataIndex: "name",
+					color: "info"
+				},
+				{
+					name: "开单额",
+					dataIndex: "amount",
+					color: "info",
+					width: 120,
+					align: "center"
+				},
+				{
+					name: "开单数",
+					dataIndex: "num",
+					color: "info",
+					align: "center"
+				}
+			],
+			dataList: [],
+			params:{
+				itemId: '',
+				searchTime:'',
+				startTime: "",
+				endTime: "",
+				shopId: "",
+			},
+			profile:[],
+			statData:[],
+			searchContent:'',
+		};
+	},
+	onPullDownRefresh() {
+		this.resetList();
+		this.getList().then(res => {
+			uni.stopPullDownRefresh();
+		});
+	},
+	onLoad(e) {
+		this.itemId = e.id;
+		this.params.itemId = e.id;
+		this.shopId = this.getLoginInfo.shopId;
+	},
+	methods: {
+		...mapActions(['setUserShopAll']),
+        getDetail(item){
+
+        },
+		//选择分店
+		selectShopFn(val){
+			this.params.shopId = val.id;
+			this.init();
+		},
+		//选择时间
+		selectDateFn(val) {
+			this.params = {...this.params,...val}
+			this.init();			
+		},
+		async init() {
+			this.getList();
+		},
+		getList() {
+			let that = this
+			uni.showLoading()
+			getStatWorkCat(this.params).then(res => {
+				uni.hideLoading()
+				if (!this.$util.isEmpty(res.data.list)) {
+					that.statData = res.data.list
+				}else{
+					that.statData=[]
+				}
+			});
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.ex-page {
+	background: white;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	.top-bar {
+		position: absolute;
+		left: 0;
+		top:100upx;
+		display: flex;
+		width: 100%;
+		z-index: 20;
+		.bar{
+			width: 50%;
+			height: 100%;
+			text-align: center;
+			&:nth-child(1){
+				border-right: 1upx solid #eeeeec;
+			}
+		}
+	}
+	.main-view {
+		margin-top: 80upx;
+		flex: 1;
+		background-color: #f9fbfc;
+		.space-view {
+			background-color: #fff;
+			.change-level{
+				font-size:22upx;
+				padding:10upx 15upx;
+			}
+		}
+		.ex-info {
+			padding: 30upx;
+			.info-cell {
+				display: flex;
+				align-items: center;
+				font-size: 28upx;
+				&:not(:first-child) {
+					margin-top: 20upx;
+				}
+				.cell-label {
+					width: 110upx;
+					color: #666666;
+				}
+				.cell-value {
+					margin-left: 40upx;
+					color: #333;
+					&.warning {
+						color: #ffaf1d;
+					}
+					&.success {
+						color: #27c325;
+					}
+				}
+			}
+		}
+		.ex-table {
+			/deep/.icon-info {
+				color: #333333;
+			}
+		}
+	}
+	.bar-view {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 30upx;
+		width: 100%;
+		height: 100upx;
+
+		box-shadow: 0upx -1upx 6upx 0upx rgba(4, 0, 0, 0.06);
+		.info-view {
+			font-size: 26upx;
+		}
+		.btn-view {
+			display: flex;
+			.admin-button-com {
+				margin: 0 10upx;
+			}
+		}
+	}
+}
+</style>

hdApp/src/api/stat/index.js

@@ -1,5 +1,9 @@
 import https from '@/plugins/luch-request_0.0.7/request'
 
+export const getStatWorkCat = data => {
+	return https.get('/stat-work-cat/profile', data)
+}
+
 //数据统计
 export const getStatList = data => {
 	return https.get('/stat/list', data)

hdApp/src/pages.json

@@ -13,6 +13,7 @@
 			"root": "admin/work",
 			"pages": [
 				{"path": "add","style": {"navigationBarTitleText": "新建制作单"}},
+				{"path": "statCat","style": {"navigationBarTitleText": "制作统计"}},
 				{"path": "addResult","style": {"navigationBarTitleText": "新建成功"}},
 				{"path": "list","style": {"navigationBarTitleText": "列表","enablePullDownRefresh": true}},
 				{"path": "detail","style": {"navigationBarTitleText": "详情"}}