shish 10 месяцев назад
Родитель
Сommit
3ad5d163ff

+ 10 - 17
hdApp/src/admin/goods/add.vue

@@ -64,16 +64,6 @@
           <input v-model="form.price" placeholder-class="phcolor" class="tui-input" name="price" placeholder="请输入价格" maxlength="10" type="digit" />
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">已售数量</view>
-          <input v-model="form.sold" placeholder-class="phcolor" class="tui-input" name="sold" placeholder="客户端展示:已售数量+实售数量" maxlength="10" type="number" />
-        </tui-list-cell>
-        <!-- <tui-list-cell class="line-cell" :hover="true" :arrow="true">
-          <view class="tui-title required">品种</view>
-          <view v-if="!$util.isEmpty(form.kindName)" style="width:480upx" @click.stop="changeKind()">{{form.kindName}}</view>
-          <view v-else style="color:#CCCCCC;width:480upx" @click.stop="changeKind()">请选择</view>
-        </tui-list-cell> -->
-
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存状态</view>
           <view class="btn-group">
@@ -93,15 +83,20 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title required">重量(公斤)</view>
+          <view class="tui-title required">重量</view>
           <input v-model="form.weight" placeholder-class="phcolor" @focus="onWeightFocus" @blur="onWeightBlur" class="tui-input" name="weight" placeholder="公斤,可输入小数" maxlength="10" type="digit" />
         </tui-list-cell>
 
+       <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">已售数量</view>
+          <input v-model="form.sold" placeholder-class="phcolor" class="tui-input" name="sold" placeholder="客户端展示:已售数量+实售数量" maxlength="10" type="number" />
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">节日涨价</view>
+          <view class="tui-title">自动涨价</view>
           <view class="btn-group">
             <button class="option-btn" :class="[form.autoRise === '1' ? 'active' : '']" @click="autoRiseChange('1')">参与涨价</button>
-            <button class="option-btn" :class="[form.autoRise === '0' ? 'active' : '']" @click="autoRiseChange('0')">不涨价</button>
+            <button class="option-btn" :class="[form.autoRise === '0' ? 'active' : '']" @click="autoRiseChange('0')">不涨价</button>
           </view>
         </tui-list-cell>
 
@@ -331,11 +326,9 @@ export default {
       this.form.stockSet = status;
       if (status === '1') {
         // 如果当前库存是默认的大数值,清空让用户输入
-        if (this.form.stock >= 9999) {
-          this.form.stock = "";
-        }
+        this.form.stock = ""
       } else if (status === '0') {
-        this.form.stock = 9999;
+        this.form.stock = 999
       }
     },
     // 节日涨价

+ 11 - 13
hdApp/src/admin/goods/detail.vue

@@ -68,11 +68,6 @@
           <input v-model="form.price" @focus="onPriceFocus" @blur="onPriceBlur" placeholder-class="phcolor" class="tui-input" name="price" placeholder="请输入价格" maxlength="10" type="digit" />
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">已售数量</view>
-          <input v-model="form.sold" placeholder-class="phcolor" @focus="soldFocusHandler" @blur="soldBlurHandler"  class="tui-input" name="sold" placeholder="客户端展示:已售数量+实售数量" maxlength="10" type="number" />
-        </tui-list-cell>
-
         <!-- <tui-list-cell class="line-cell" :hover="true" :arrow="true">
           <view class="tui-title required">品种</view>
           <view v-if="!$util.isEmpty(form.kindName)" style="width:480upx;" @click.stop="changeKind()">{{form.kindName}}</view>
@@ -98,15 +93,20 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">重量(公斤)</view>
+          <view class="tui-title">重量</view>
           <input v-model="form.weight" @focus="onWeightFocus" @blur="onWeightBlur" placeholder-class="phcolor" class="tui-input" name="weight" placeholder="公斤,可输入小数" maxlength="10" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">节日涨价</view>
+          <view class="tui-title">已售数量</view>
+          <input v-model="form.sold" placeholder-class="phcolor" @focus="soldFocusHandler" @blur="soldBlurHandler"  class="tui-input" name="sold" placeholder="客户端展示:已售数量+实售数量" maxlength="10" type="number" />
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <view class="tui-title">自动涨价</view>
           <view class="btn-group">
             <button class="option-btn" :class="[form.autoRise === '1' ? 'active' : '']" @click="autoRiseChange('1')">参与涨价</button>
-            <button class="option-btn" :class="[form.autoRise === '0' ? 'active' : '']" @click="autoRiseChange('0')">不涨价</button>
+            <button class="option-btn" :class="[form.autoRise === '0' ? 'active' : '']" @click="autoRiseChange('0')">不涨价</button>
           </view>
         </tui-list-cell>
 
@@ -305,11 +305,9 @@ export default {
       this.form.stockSet = status;
       if (status === '1') {
         // 如果当前库存是默认的大数值,清空让用户输入
-        if (this.form.stock >= 9999) {
-          this.form.stock = "";
-        }
+        this.form.stock = "";
       } else if (status === '0') {
-        this.form.stock = 9999;
+        this.form.stock = 999;
       }
     },
     // 仅支持自取
@@ -338,7 +336,7 @@ export default {
         // 设置库存状态与库存数量
         if (res.data.stockSet == "0") {
           this.form.stockSet = "0";
-          this.form.stock = 9999;
+          this.form.stock = 999;
         } else {
           this.form.stockSet = "1";
           this.form.stock = res.data.stock || "";

+ 9 - 9
hdApp/src/admin/goods/list.vue

@@ -160,8 +160,8 @@ export default {
       lastSearchText:'', // 上次的搜索内容
       searchTimer: null, // 搜索防抖定时器
       riseData: {}, // 价格上涨配置
-      stockStatus:0, // 1:有库存 2:无库存
-      priceStatus:0, // 1:有价格 2:无价格
+      hasStock:-1, // 0没库存 1有库存
+      priceType:-1, // 0 无价格,1 有价格 
       // 新增筛选相关数据
       showFilterPanel: false,
       selectedPrice: null,  // 选中的价格筛选
@@ -170,11 +170,11 @@ export default {
       // 筛选选项配置
       priceOptions: [
         { label: '有价格', value: 1 },
-        { label: '无价格', value: 2 }
+        { label: '无价格', value: 0 }
       ],
       stockOptions: [
         { label: '有库存', value: 1 },
-        { label: '无库存', value: 2 }
+        { label: '无库存', value: 0 }
       ],
       flowerNumOptions: [
         { label: '6支', value: 6 },
@@ -246,8 +246,8 @@ export default {
       this.selectedFlowerNum = null;
       
       // 清空后立即更新筛选变量
-      this.priceStatus = 0;
-      this.stockStatus = 0;
+      this.priceType = -1;
+      this.hasStock = -1;
       this.flowerNum = 0;
       
       // 关闭筛选面板
@@ -260,8 +260,8 @@ export default {
     
     confirmFilters() {
       // 更新原有的筛选变量以保持兼容性
-      this.priceStatus = this.selectedPrice || 0;
-      this.stockStatus = this.selectedStock || 0;
+      this.priceType = this.selectedPrice || 0;
+      this.hasStock = this.selectedStock || 0;
       this.flowerNum = this.selectedFlowerNum || 0;
       
       // 关闭筛选面板
@@ -356,7 +356,7 @@ export default {
       }
     },
     getGoodsList() {
-      return getCategoryToGoods({page: this.list.page,searchText:this.lastSearchText,catId:this.catId, flowerNum:this.flowerNum, priceStatus:this.priceStatus, stockStatus:this.stockStatus,requestType:'goodsList'}).then(res => {
+      return getCategoryToGoods({page: this.list.page,searchText:this.lastSearchText,catId:this.catId, flowerNum:this.flowerNum, priceType:this.priceType, hasStock:this.hasStock,requestType:'goodsList'}).then(res => {
         this.completes(res)
       })
     },

+ 1 - 1
hdApp/src/mixins/hs.js

@@ -169,7 +169,7 @@ export default {
                 return false
             }
             let that = this
-			getCategoryToGoods({classId:this.globalClassId,requestType:this.globalRequestType,page:this.globalPage,
+			getCategoryToGoods({cId:this.globalClassId,requestType:this.globalRequestType,page:this.globalPage,
 				search:this.globalPy,customId:this.globalCustomId,globalCgMyCharge:this.globalCgMyCharge,lookStock:this.globalLookStock}).then(res=>{
 				if(res.code == 1){
 					that.globalItemData = that.globalPage == 1 ? res.data.list : that.globalItemData.concat(res.data.list)