花材删除

ghsApp/src/admin/changePrice/outList.vue

@@ -56,7 +56,7 @@
 		</view>
 
       <div class="app-footer">
-		<button class="admin-button-com big blue" @click="stopSelect()">停用所选</button>
+		<button class="admin-button-com big blue" @click="stopSelect()">删除所选</button>
       </div>
 
 		<uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">

ghsApp/src/admin/changePrice/stopList.vue

@@ -56,8 +56,8 @@
 		</view>
 
       <div class="app-footer">
-		<button class="admin-button-com big blue" @click="enableSelect()">启用所选</button>
-		<button class="admin-button-com big blue" @click="removeSelect()">删除所选</button>
+		<button class="admin-button-com big blue" @click="enableSelect()">恢复所选</button>
+		<button class="admin-button-com big blue" @click="removeSelect()">彻底删除</button>
       </div>
 
 		<uni-popup ref="selectFlowerNumRef" background-color="#fff" type="center" :animation="false" class="class-popup-style">
@@ -125,7 +125,7 @@ export default {
 				this.$msg('请选择花材')
 				return false
 			}
-			this.$util.confirmModal({content:'确认启用所选花材？'},() => {
+			this.$util.confirmModal({content:'确认恢复所选花材？'},() => {
 				batchEnable({ids:JSON.stringify(that.currentList)}).then(res=>{
 					if(res.code == 1){
 						that.$msg(res.msg)

ghsApp/src/admin/item/add.vue

@@ -109,15 +109,6 @@
           </div>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">状态</div>
-          <div class="switch_bx">
-            <switch :checked="form.delStatus == 0 ? true : false" @change="delStatusChange" style="transform: scale(0.8,0.8)" />
-            <text v-if="form.delStatus == 0">启用</text>
-            <text v-else>停用</text>
-          </div>
-        </tui-list-cell>
-
       </div>
 
       <div class="module-com input-line-wrap goods-wrap">
@@ -209,7 +200,6 @@ export default {
         cover:[],
         stockWarning:5,
         status:2,
-        delStatus:0,
         itemId:0,
         smallRatio:1,
         ratioType:0
@@ -316,9 +306,6 @@ export default {
     ratioTypeChange(e){
       this.form.ratioType = e.detail.value ? 0 : 1;
     },
-    delStatusChange(e){
-      this.form.delStatus = e.detail.value ? 0 : 1;
-    },
     //如果库存被修改则花材状态变化
     changeStock(event){
       let num = Number(event.target.value)
@@ -374,7 +361,6 @@ export default {
         this.form.itemId = ptItemId
         this.form.classId = ''
         this.form.status = 1
-        this.form.delStatus = 0
         this.form.id = 0
         this.form.price = ''
         this.form.skMore = 6

ghsApp/src/admin/item/copy.vue

@@ -109,15 +109,6 @@
           </view>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">状态</view>
-          <view class="switch_bx">
-            <switch :checked="form.delStatus == 0 ? true : false" @change="delStatusChange" style="transform: scale(0.8,0.8)" />
-            <text v-if="form.delStatus == 0">启用</text>
-            <text v-else>停用</text>
-          </view>
-        </tui-list-cell>
-
       </view>
 
       <view class="module-com input-line-wrap goods-wrap">
@@ -211,7 +202,6 @@ export default {
         cover:[],
         stockWarning:5,
         status:2,
-        delStatus:0,
         itemId:0,
         smallRatio:1,
         ratioType:0
@@ -318,9 +308,6 @@ export default {
     ratioTypeChange(e){
       this.form.ratioType = e.detail.value ? 0 : 1;
     },
-    delStatusChange(e){
-      this.form.delStatus = e.detail.value ? 0 : 1;
-    },
     //如果库存被修改则花材状态变化
     changeStock(event){
       let num = Number(event.target.value)
@@ -374,7 +361,6 @@ export default {
         this.form.itemId = ptItemId
         this.form.classId = ''
         this.form.status = 1
-        this.form.delStatus = 0
         this.form.id = 0
         this.form.price = ''
         this.form.skPrice = ''

ghsApp/src/admin/item/detail.vue

@@ -114,15 +114,6 @@
           </view>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">状态</view>
-          <view class="switch_bx">
-            <switch :checked="form.delStatus == 0 ? true : false" @change="delStatusChange" style="transform: scale(0.8,0.8)" />
-            <text v-if="form.delStatus == 0">启用</text>
-            <text v-else>停用</text>
-          </view>
-        </tui-list-cell>
-
       </view>
 
       <view class="module-com input-line-wrap goods-wrap">
@@ -257,7 +248,6 @@ export default {
         cover:[],
         stockWarning:5,
         status:2,
-        delStatus:0,
         itemId:0,
         smallRatio:1,
         frontHide:0,
@@ -441,14 +431,6 @@ export default {
     ratioTypeChange(e){
       this.form.ratioType = e.detail.value ? 0 : 1;
     },
-    delStatusChange(e){
-      this.form.delStatus = e.detail.value ? 0 : 1;
-      if(this.form.delStatus == 1){
-        this.form.stock = 0
-        this.form.status = 2
-      }
-    },
-    //如果库存被修改则花材状态变化
     changeStock(event){
       let num = Number(event.target.value)
       if(num > 0){
@@ -501,7 +483,6 @@ export default {
         this.form.itemId = ptItemId
         this.form.classId = ''
         this.form.status = 1
-        this.form.delStatus = 0
         this.form.id = 0
         this.form.price = ''
         this.form.skMore = 6

ghsApp/src/admin/item/list.vue

@@ -100,6 +100,7 @@
 				<view style="width:100vw;margin-top:8upx;"><button @click="shareItem()">打开分享（批发）</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="getHdPosterFn()">分享海报（批发）</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="getSkPosterFn()">分享海报（零售）</button></view>
+				<view style="width:100vw;margin-top:8upx;"><button @click="delItem()">删除</button></view>
 				<view style="width:100vw;margin-top:30upx;"><button @click="closeRightShow()">取消</button></view>
 			</view>
 		</uni-popup>
@@ -125,7 +126,7 @@ import ItemStock from "./components/item";
 import productMins from "@/mixins/product";
 import { mapGetters } from "vuex";
 import { getWeixinId } from "@/api/invite";
-import { print,cancelDiscountPrice,cancelPreSell } from '@/api/product';
+import { print,cancelDiscountPrice,cancelPreSell,delStatusUpdate } from '@/api/product';
 import { getHdPoster,getSkPoster,breakItem,changeFrontHide } from '@/api/item'
 import uniPopup from '@/uni_modules/uni-popup/components/uni-popup/uni-popup.vue';
 import ModalModule from "@/components/plugin/modal"
@@ -377,6 +378,17 @@ export default {
 			this.closeRightShow()
 			this.pageTo({url: '/admin/changePrice/costChangeList?id='+this.currentInfo.id})
 		},
+		delItem(){
+			let that = this
+			that.$util.confirmModal({content:'确认删除?'},() => {
+				delStatusUpdate({id:this.currentInfo.id,delStatus:1}).then(res=>{
+					if(res.code == 1){
+						that.closeRightShow()
+						that.$msg('删除成功')
+					}
+				})
+			})
+		},
 		priceChange(){
 			this.closeRightShow()
 			this.pageTo({url: '/admin/changePrice/changeList?id='+this.currentInfo.id})

ghsApp/src/admin/item/simple.vue

@@ -33,8 +33,7 @@
 										<view style="color:#333333;font-size:29upx;" @click.stop="doPrintLabel(productItem,0)">打标签</view>
 									</t-td>
 									<t-td>
-										<view style="color:#333333;font-size:29upx;" 
-										@click="goToStockDetail(productItem)">
+										<view style="color:#333333;font-size:29upx;" @click="goToStockDetail(productItem)">
 											库明细
 										</view>
 									</t-td>
@@ -60,6 +59,7 @@
 				<view style="width:100vw;margin-top:8upx;"><button @click="orderRecord()">下单记录</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="copyCreate()">复制新建</button></view>
 				<view style="width:100vw;margin-top:8upx;"><button @click="sendStock()">分配库存</button></view>
+				<view style="width:100vw;margin-top:8upx;"><button @click="delItem()">删除</button></view>
 				<view style="width:100vw;margin-top:30upx;"><button @click="closeRightShow()">取消</button></view>
 			</view>
 		</uni-popup>
@@ -81,7 +81,7 @@
 <script>
 import AppWrapperEmpty from "@/components/app-wrapper-empty";
 import SelectList from "@/components/plugin/selectList";
-import { getProductDataApi,print,cancelDiscountPrice,cancelPreSell } from "@/api/product";
+import { getProductDataApi,print,cancelDiscountPrice,cancelPreSell,delStatusUpdate } from "@/api/product";
 import { getSimleList } from "@/api/item";
 import { allOut } from "@/api/stock-out"
 import { list } from "@/mixins";
@@ -143,6 +143,17 @@ export default {
 			this.currentInfo = item
 			this.$refs.rightShowMore.open('top')
 		},
+		delItem(){
+			let that = this
+			that.$util.confirmModal({content:'确认删除?'},() => {
+				delStatusUpdate({id:that.currentInfo.id,delStatus:1}).then(res=>{
+					if(res.code == 1){
+						that.closeRightShow()
+						that.$msg('删除成功')
+					}
+				})
+			})
+		},
 		sendStock(){
 			this.pageTo({url: '/admin/item/sendStock?id='+this.currentInfo.id+'&price='+this.currentInfo.price+'&stock='+this.currentInfo.stock+'&name='+this.currentInfo.name})
 		},

ghsApp/src/admin/ptItem/components/Item.vue

@@ -6,8 +6,8 @@
 		<view class="cmd-info_bx">
 			<view class="tit">{{ info.name || "" }}</view>
 			<view class="kc">{{info.className}}
-				<text v-if="info.select == 2 && info.is_delete == 1" style="position:absolute;right:245upx;color:red;">已停用</text>
-				<text v-if="info.select == 2 && info.is_delete == 1" style="color:#1f1cc0;float:right;margin-right:103upx;">启用</text>
+				<text v-if="info.select == 2 && info.is_delete == 1" style="position:absolute;right:245upx;color:red;">已删除</text>
+				<text v-if="info.select == 2 && info.is_delete == 1" style="color:#1f1cc0;float:right;margin-right:103upx;">恢复</text>
 				<text v-else-if="info.select == 2" style="color:#1f1cc0;float:right;margin-right:80upx;">已导入</text>
 				<text v-else style="color:green;float:right;margin-right:80upx;border:1upx solid green;padding:4upx 10upx 4upx 10upx;">选择</text>
 			</view>

ghsApp/src/admin/ptItem/itemList.vue

@@ -94,7 +94,7 @@ export default {
 		selectItem(item){
 			let that = this
 			if(item.select == 2 && item.is_delete == 1){
-				that.$util.confirmModal({content:'确认启用？'},() => {
+				that.$util.confirmModal({content:'确认恢复？'},() => {
 					delStatusUpdate({id: item.ghs_item_id, delStatus: 0}).then(res => {
 						uni.hideLoading()
 						if(res.code == 1){

ghsApp/src/pages.json

@@ -128,8 +128,8 @@
 				{"path": "changeList","style": {"navigationBarTitleText": "价格变动记录"}},
 				{"path": "costChangeList","style": {"navigationBarTitleText": "成本变动记录"}},
 				{"path": "outList","style": {"navigationBarTitleText": "已下架"}},
-				{"path": "stopList","style": {"navigationBarTitleText": "已停用"}},
-				{"path": "removeList","style": {"navigationBarTitleText": "已删除"}},
+				{"path": "stopList","style": {"navigationBarTitleText": "已删除"}},
+				{"path": "removeList","style": {"navigationBarTitleText": "彻底删除"}},
 				{"path": "changeClass","style": {"navigationBarTitleText": "批量移动"}},
 				{"path": "setSon","style": {"navigationBarTitleText": "设置子花材"}},
 				{"path": "batchChange","style": {"navigationBarTitleText": "批量改价"}}
@@ -261,6 +261,7 @@
 			"root": "admin/stat",
 			"pages": [
 				{"path": "profit","style": {"navigationBarTitleText": "利润表"}},
+				{"path": "classProfit","style": {"navigationBarTitleText": "分类收入"}},
 				{"path": "productSale","style": {"navigationBarTitleText": "花材销量"}},
 				{"path": "kdIncome","style": {"navigationBarTitleText": "收入统计"}},
 				{"path": "customSale","style": {"navigationBarTitleText": "客户下单排行"}},