排序问题

hdApp/src/admin/home/apply.vue

@@ -49,7 +49,8 @@ export default {
                 { name: "买花记录", emoji: "📊", url: "/pagesPurchase/shopping",pf:1},
                 { name: "报损", emoji: "🗑️", url: "/admin/breakage/list",pf:1},
                 { name: "拆散", emoji: "✂️", url: "/admin/part/list",pf:1},
-                { name: "盘点", emoji: "📦", url: "/pagesStorehouse/inventory/list",pf:1}
+                { name: "盘点", emoji: "📦", url: "/pagesStorehouse/inventory/list",pf:1},
+                { name: "排序", emoji: "↕️", url: "/admin/itemClass/sort",pf:1},
             ]
         },
         {

hdApp/src/admin/item/detail.vue

@@ -120,6 +120,47 @@
           </view>
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">包装类型</view>
+          <view>
+            <button class="admin-button-com middle" :class="form.ratioType == 0 ? 'blue' : 'default'" @click="ratioTypeChange(0)">固定支数</button>
+            <button class="admin-button-com middle" :class="form.ratioType == 1 ? 'blue' : 'default'" @click="ratioTypeChange(1)" style="margin-left:20upx;">没有固定</button>
+            <button class="admin-button-com middle default" v-if="option.ptItemId" @click="oneZhiChange()" style="margin-left:20upx;">1支装</button>
+          </view>
+        </tui-list-cell>
+
+<block v-if="option.ptItemId">
+        <tui-list-cell class="line-cell" :arrow="true">
+          <view class="tui-title">大单位</view>
+          <picker mode="selector" :value="form.bigUnitId" :range="unitData" range-key="name" @change="changeBigUnitFn" class="tui-input" >
+            <input v-model="form.bigUnitId" name="bigUnitId" type="text" hidden />
+            <view v-if="form.bigUnitId" style="width:300upx;height:45upx;">{{ bigUnitSelectedData.name }}</view>
+            <view class="tui-placeholder" style="height:45upx;" v-else>请选择</view>
+          </picker>
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :arrow="true">
+          <view class="tui-title">小单位</view>
+          <picker mode="selector" :value="form.smallUnitId" :range="unitData" range-key="name" @change="changeSmallUnitFn" class="tui-input" >
+            <input v-model="form.smallUnitId" name="smallUnitId" type="text" hidden />
+            <view v-if="form.smallUnitId" style="width:300upx;height:45upx;">{{ smallUnitSelectedData.name }}</view>
+            <view class="tui-placeholder" style="height:45upx;" v-else>请选择</view>
+          </picker>
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :arrow="false" v-if="form.ratioType == 0" :hover="false">
+          <view class="tui-title">几支装</view>
+          <input v-model="form.ratio" placeholder-class="phcolor" style="width:300upx;"
+          class="tui-input" name="ratio" placeholder="20支装填20" maxlength="50" type="number" />
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :arrow="false" :hover="false">
+          <view class="tui-title">每扎重量</view>
+          <input v-model="form.weight" placeholder-class="phcolor" style="width:200upx;"
+          class="tui-input" name="weight" placeholder="公斤" maxlength="50" type="digit" />
+        </tui-list-cell>
+</block>
+<block v-else>
         <tui-list-cell class="line-cell" :arrow="false" :hover="false">
           <view class="tui-title">大单位</view>
           <input v-model="form.bigUnitId" name="bigUnitId" type="text" hidden />
@@ -136,14 +177,6 @@
           <button v-else class="admin-button-com default middle" style="width:150upx;" @click.stop="notAllowChange()">修改</button>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">包装类型</view>
-          <view>
-            <button class="admin-button-com middle" :class="form.ratioType == 0 ? 'blue' : 'default'" @click="ratioTypeChange(0)">固定支数</button>
-            <button class="admin-button-com middle" :class="form.ratioType == 1 ? 'blue' : 'default'" @click="ratioTypeChange(1)" style="margin-left:140upx;">没有固定</button>
-          </view>
-        </tui-list-cell>
-
         <tui-list-cell class="line-cell" :arrow="false" v-if="form.ratioType == 0" :hover="false">
           <view class="tui-title">几支装</view>
           <input v-model="form.ratio" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="width:300upx;color:#CCCCCC;"
@@ -162,6 +195,7 @@
           <button v-if="productData.id > 0 && productData.hasRightChange == 1" class="admin-button-com blue middle" @click.stop="changeWeight()" style="width:150upx;">修改</button>
           <button v-else class="admin-button-com default middle" style="width:150upx;" @click.stop="notAllowChange()">修改</button>
         </tui-list-cell>
+</block>
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">每人限购</view>
@@ -169,7 +203,6 @@
 
           <button v-if="productData.id > 0 && form.limitBuy>0" class="admin-button-com blue middle" @click.stop="clearBuyCache()" style="width:150upx;">清已购</button>
           <button v-else class="admin-button-com default middle" style="width:150upx;" @click.stop="">清已购</button>
-
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -601,6 +634,21 @@ export default {
 
   },
   methods: {
+    oneZhiChange(){
+      if (!Array.isArray(this.unitData) || this.unitData.length < 2) {
+        this.$msg('无法设置1支装')
+        return
+      }
+      const defaultUnit = this.unitData[1]
+      this.bigUnitSelectedData = defaultUnit
+      this.smallUnitSelectedData = defaultUnit
+      this.form.bigUnitId = defaultUnit.id
+      this.form.smallUnitId = defaultUnit.id
+      this.form.ratio = 1
+      this.form.ratioType = 0
+      this.form.weight = 0.1
+      this.$forceUpdate()
+    },
     selectMyItem(){
       this.$util.pageTo({ url: '/admin/item/selectItem?style=3'})
     },
@@ -1317,7 +1365,7 @@ export default {
 
       let form = JSON.parse(JSON.stringify(this.form))
       form.images = form.images.join(',')
-      uni.showLoading({mask:true,title:'提交中'})
+      uni.showLoading()
       requestHost({...form,appVersion:1}).then(res => {
         uni.hideLoading()
         if(res.code == 1){

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

@@ -24,8 +24,8 @@
 			<view class="num-open_bx">
 				<view class="open-bx warn">
 					<text>编号 {{info.id}}</text>
-					<text style="margin-left:25upx;" v-if="info.ratioType == 0">{{info.ratio}}{{info.smallUnit}}/<text @click="changeAuth(info.id)">{{ info.bigUnit }}</text></text>
-					<text style="margin-left:25upx;" v-else>若干{{info.smallUnit}}/<text @click="changeAuth(info.id)">{{ info.bigUnit }}</text></text>
+					<text style="margin-left:25upx;color:#3385FF;font-weight:bold;" v-if="info.ratioType == 0">{{info.ratio}}{{info.smallUnit}}/<text @click="changeAuth(info.id)">{{ info.bigUnit }}</text></text>
+					<text style="margin-left:25upx;color:#3385FF;font-weight:bold;" v-else>若干{{info.smallUnit}}/<text @click="changeAuth(info.id)">{{ info.bigUnit }}</text></text>
 				</view>
 			</view>
 		</view>

hdApp/src/admin/ptItem/itemList.vue

@@ -126,9 +126,7 @@ export default {
 					})
 					return
 				}
-				this.$util.confirmModal({content:'确认采用？'},() => {
-					this.$util.pageTo({ url: '/admin/item/detail',type:2,query:{ptItemId:item.id}})
-				})
+				this.$util.pageTo({ url: '/admin/item/detail',type:2,query:{ptItemId:item.id}})
 			}
 		},
 		affirm(val) {

hdApp/src/api/product/index.js

@@ -30,6 +30,10 @@ export const getGhsProductDetail = data => {
 	return https.get('/product/ghs-product-detail', data)
 }
 
+export const batchChangeMore = data => {
+	return https.post("/product/batch-change-more", data);
+}
+
 /** *
  * 分类及花材数据(库存预警、库存管理共用这个接口)
  * @parmas py 花材拼音

hdApp/src/pages.json

@@ -114,7 +114,10 @@
 			"pages": [
 				{"path": "list","style": {"navigationBarTitleText": "花材分类"}},
 				{"path": "addPrice","style": {"navigationBarTitleText": "加价设置"}},
-				{"path": "more","style": {"navigationBarTitleText": "更多"}}
+				{"path": "more","style": {"navigationBarTitleText": "更多"}},
+				{"path": "sort","style": {"navigationBarTitleText": "花材排序"}},
+				{"path": "num","style": {"navigationBarTitleText": "数量排序"}},
+				{"path": "pull","style": {"navigationBarTitleText": "拖拽排序"}}
 			]
 		},
 		{