Merge branch 'dev' of 47.94.45.65:angelo/web-retail-admin into test

src/api/product.js

@@ -766,6 +766,15 @@ export function specialPostage(params) {
     params
   })
 }
+
+// getMaxSortNum
+export function getMaxSortNum(params) {
+  return request({
+    url: 'sale/manage/wares/getMaxSortNum',
+    method: 'get',
+    params
+  })
+}
 // 产品生成
 export function generateProduct(params) {
   return request({

src/views/goodsManage/goodsList/goodsEdit/jcsz.vue

@@ -335,15 +335,15 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="商品排序" prop="sortStatus">
-                  <el-select v-model="form.sortStatus" clearable>
-                    <el-option
-                      v-for="item in sortList"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value"
-                    />
-                  </el-select>
+                <el-form-item label="商品排序" prop="sort">
+                  <el-input-number
+                    v-model="form.sort"
+                    style="width: 100%"
+                    clearable
+                    :placeholder="'请输入'"
+                    :max="99999"
+                    :controls="false"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">

src/views/goodsManage/goodsList/index.vue

@@ -287,6 +287,7 @@
             :label="'排序'"
           >
           </el-table-column> -->
+
           <el-table-column align="center" prop="cover" :label="'商品主图'">
             <template slot-scope="scope">
               <img class="bgImg" :src="scope.row.cover" alt="">
@@ -588,6 +589,12 @@
             width="120"
             label="下架时间"
           />
+          <el-table-column
+            align="center"
+            prop="sort"
+            width="120"
+            label="商品排序"
+          />
           <el-table-column
             align="center"
             prop="time"

src/views/goodsManage/goodsRelease/jcsz.vue

@@ -297,15 +297,23 @@
                 </el-form-item>
               </el-col>
               <el-col :span="8">
-                <el-form-item label="商品排序" prop="sortStatus">
-                  <el-select v-model="form.sortStatus" clearable>
+                <el-form-item label="商品排序" prop="sort">
+                  <!-- <el-select v-model="form.sortStatus" clearable>
                     <el-option
                       v-for="item in sortList"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
                     />
-                  </el-select>
+                  </el-select> -->
+                  <el-input-number
+                    v-model="form.sort"
+                    style="width: 100%"
+                    clearable
+                    :placeholder="'请输入'"
+                    :max="99999"
+                    :controls="false"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -1026,9 +1034,17 @@ export default {
 
     // 获取极差列表
     this.getRangeList()
+    this.getMaxSortNum()
   },
   methods: {
     isLocals,
+    getMaxSortNum() {
+      api.getMaxSortNum().then((res) => {
+        if (res.code === 200) {
+          this.$set(this.form, 'sort', res.data)
+        }
+      })
+    },
     getOther() {
       api.get_sort().then((res) => {
         this.sortList = res.data