优化模块商品添加

.env.development

@@ -3,9 +3,9 @@ ENV = 'development'
 
 # base api
 # VUE_APP_BASE_API = '/dev-api'
-# VUE_APP_BASE_API = 'http://192.168.1.22:9104'
+ VUE_APP_BASE_API = 'http://192.168.1.22:9104'
 # VUE_APP_BASE_API = 'http://192.168.1.26:9104'
- VUE_APP_BASE_API = 'https://mai-b.caimei365.com'
+# VUE_APP_BASE_API = 'https://mai-b.caimei365.com'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

src/styles/index.scss

@@ -189,3 +189,11 @@ aside {
 .multiselect--active {
   z-index: 1000 !important;
 }
+// 处理input type = number的上下箭头
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+}
+input[type="number"]{
+  -moz-appearance: textfield;
+}

src/views/goods/category.vue

@@ -124,9 +124,10 @@ export default {
       const sorts = []
       this.list.map(item => {
         if (item.sort) {
-          sorts.push(item.id + '-' + item.sort)
+          sorts.push(item.id + '-' + Math.abs(item.sort))
         }
       })
+      console.log(sorts)
       saveCategorySort({ newProducSorttList: sorts.join(',') }).then(() => {
         this.getList()
       }).catch(() => {

src/views/goods/list-commonly.vue

@@ -11,7 +11,7 @@
     <div class="filter-container">
       <el-form class="demo-form-inline goods-list">
         <el-form-item label="商品ID:" style="width:225px;float: left;">
-          <el-input v-model="listQuery.id" placeholder="请输入商品ID" maxlength="30" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.id" placeholder="请输入商品ID" maxlength="30" type="number" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />
         </el-form-item>
         <el-form-item label="商品名称:" style="width:240px;float: left;">
           <el-input v-model="listQuery.productName" placeholder="请输入商品名称" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />
@@ -33,9 +33,9 @@
           <el-button class="filter-item" type="primary" icon="el-icon-sort" @click="batchSaveSort">批量更新排序</el-button>
         </el-form-item>
         <el-form-item style="width:120px;float: left;">
-          <el-button class="filter-item" type="primary" icon="el-icon-circle-plus-outline">
-            <router-link :to="'/goods/list/select/'+ modulesId">添加商品</router-link>
-          </el-button>
+          <router-link :to="'/goods/list/select/'+ modulesId">
+            <el-button class="filter-item" type="primary" icon="el-icon-circle-plus-outline">添加商品</el-button>
+          </router-link>
         </el-form-item>
       </el-form>
     </div>
@@ -189,6 +189,7 @@ export default {
 </script>
 
 <style scoped>
+
 .filter-container .filter-item,.el-form-item{
   margin-bottom: 0;
 }

src/views/goods/list-preferential.vue

@@ -11,7 +11,7 @@
     <div class="filter-container">
       <el-form class="demo-form-inline goods-list">
         <el-form-item label="商品ID:" style="width:225px;float: left;margin-bottom: 8px;">
-          <el-input v-model="listQuery.id" placeholder="请输入商品ID" maxlength="30" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.id" type="number" placeholder="请输入商品ID" maxlength="30" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />
         </el-form-item>
         <el-form-item label="商品名称:" style="width:240px;float: left;">
           <el-input v-model="listQuery.productName" placeholder="请输入商品名称" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />
@@ -33,9 +33,9 @@
           <el-button class="filter-item" type="primary" icon="el-icon-sort" @click="batchSaveSort">批量更新排序</el-button>
         </el-form-item>
         <el-form-item style="width:120px;float: left;">
-          <el-button class="filter-item" type="primary" icon="el-icon-circle-plus-outline">
-            <router-link :to="'/goods/list/select/'+ modulesId">添加商品</router-link>
-          </el-button>
+          <router-link :to="'/goods/list/select/'+ modulesId">
+            <el-button class="filter-item" type="primary" icon="el-icon-circle-plus-outline">添加商品</el-button>
+          </router-link>
         </el-form-item>
       </el-form>
     </div>
@@ -189,6 +189,7 @@ export default {
 </script>
 
 <style scoped>
+
 .filter-container .filter-item,.el-form-item{
   margin-bottom: 0;
 }

src/views/goods/list-preferred.vue

@@ -11,7 +11,7 @@
     <div class="filter-container">
       <el-form class="demo-form-inline goods-list">
         <el-form-item label="商品ID:" style="width:225px;float: left;margin-bottom: 8px;">
-          <el-input v-model="listQuery.id" placeholder="请输入商品ID" maxlength="30" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.id" type="number" placeholder="请输入商品ID" maxlength="30" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />
         </el-form-item>
         <el-form-item label="商品名称:" style="width:240px;float: left;">
           <el-input v-model="listQuery.productName" placeholder="请输入商品名称" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />
@@ -33,9 +33,9 @@
           <el-button class="filter-item" type="primary" icon="el-icon-sort" @click="batchSaveSort">批量更新排序</el-button>
         </el-form-item>
         <el-form-item style="width:120px;float: left;">
-          <el-button class="filter-item" type="primary" icon="el-icon-circle-plus-outline">
-            <router-link :to="'/goods/list/select/'+ modulesId">添加商品</router-link>
-          </el-button>
+          <router-link :to="'/goods/list/select/'+ modulesId">
+            <el-button class="filter-item" type="primary" icon="el-icon-circle-plus-outline">添加商品</el-button>
+          </router-link>
         </el-form-item>
       </el-form>
     </div>
@@ -189,6 +189,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
 .filter-container .filter-item,.el-form-item{
   margin-bottom: 0;
 }

src/views/goods/list-select.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container" style="padding: 0 20px;">
+  <div class="app-container" style="padding: 0 20px 20px 20px;">
 
     <el-menu :default-active="moduleId" class="el-menu-demo" mode="horizontal">
       <el-menu-item v-if="moduleId===1 && modules && modules.firstModulesName" index="1">{{ modules.firstModulesName }}</el-menu-item>
@@ -128,7 +128,19 @@ export default {
     },
     fetchData() {
       this.listLoading = true
-      getAddList(this.listQuery).then(response => {
+      let params = {}
+      switch (this.moduleId) {
+        case 1:
+          params = Object.assign({ preferredProduct: 1 }, this.listQuery)
+          break
+        case 2:
+          params = Object.assign({ preferentialProduct: 1 }, this.listQuery)
+          break
+        case 3:
+          params = Object.assign({ commonlyProduct: 1 }, this.listQuery)
+          break
+      }
+      getAddList(params).then(response => {
         const { productsPage, listByEffective } = response.data
         this.list = productsPage.results
         this.total = productsPage.totalRecord

src/views/goods/list.vue

@@ -11,7 +11,7 @@
     <div class="filter-container" style="padding: 20px 0;">
       <el-form class="demo-form-inline goods-list">
         <el-form-item label="商品ID:" style="width:225px;float: left;">
-          <el-input v-model="listQuery.id" placeholder="请输入商品ID" maxlength="30" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.id" type="number" placeholder="请输入商品ID" maxlength="30" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />
         </el-form-item>
         <el-form-item label="商品名称:" style="width:240px;float: left;">
           <el-input v-model="listQuery.productName" placeholder="请输入商品名称" style="width: 150px;" class="filter-item" @keyup.enter.native="handleFilter" />

src/views/order/list.vue

@@ -3,7 +3,7 @@
     <div class="filter-container">
       <el-form ref="searchForm" :inline="true" class="demo-form-inline">
         <el-form-item label="订单ID:" style="width:180px;float: left;">
-          <el-input v-model="listQuery.orderID" placeholder="请输入订单ID" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.orderID" type="number" placeholder="请输入订单ID" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
         </el-form-item>
         <el-form-item label="订单号:" style="width:180px;float: left;">
           <el-input v-model="listQuery.orderNo" placeholder="请输入订单号" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
@@ -100,7 +100,7 @@
       <el-table-column label="订单编号" align="center" prop="orderNo" />
       <el-table-column label="买家" align="center" prop="buyer" />
       <el-table-column label="收货人" align="center" prop="receiver" />
-      <el-table-column label="订单状态" align="center" prop="status">
+      <el-table-column label="订单状态" align="center" prop="status" width="150px">
         <template slot-scope="{row}">
           <template v-if="['11','12','13','21','22','23','31','32','33'].indexOf(row.status)>=0">
             <el-tag type="success" size="small">交易中</el-tag><span style="display: inline-block;margin:5px;">{{ statusObj[row.status] }}</span>
@@ -117,13 +117,6 @@
           <el-tag v-if="row.receiptStatus*1===3" type="success" size="small">已收款</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="付款状态" align="center" prop="payStatus">
-        <template slot-scope="{row}">
-          <el-tag v-if="row.payStatus*1===1" type="danger" size="small">待付款</el-tag>
-          <el-tag v-if="row.payStatus*1===2" type="warning" size="small">部分付款</el-tag>
-          <el-tag v-if="row.payStatus*1===3" type="success" size="small">已付款</el-tag>
-        </template>
-      </el-table-column>
       <el-table-column label="发货状态" align="center" prop="sendOutStatus">
         <template slot-scope="{row}">
           <el-tag v-if="row.sendOutStatus*1===1" type="danger" size="small">待发货</el-tag>
@@ -133,8 +126,8 @@
       </el-table-column>
       <el-table-column label="退款状态" align="center" prop="refundType">
         <template slot-scope="{row}">
-          <el-tag v-if="row.refundType*1===1" type="info" size="small">部分退</el-tag>
-          <el-tag v-else-if="row.refundType*1===2" type="info" size="small">全部退</el-tag>
+          <el-tag v-if="row.refundType*1===1" type="info" size="small">部分退款</el-tag>
+          <el-tag v-else-if="row.refundType*1===2" type="info" size="small">全部退款</el-tag>
           <el-tag v-else type="info" size="small">无退款</el-tag>
         </template>
       </el-table-column>

src/views/order/refund.vue

@@ -6,7 +6,7 @@
           <el-input v-model="listQuery.returnedNo" placeholder="请输入退款编号" style="width: 140px;" class="filter-item" @keyup.enter.native="handleFilter" />
         </el-form-item>
         <el-form-item label="订单ID:" style="width:180px;float: left;">
-          <el-input v-model="listQuery.orderID" placeholder="请输入订单ID" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
+          <el-input v-model="listQuery.orderID" type="number" placeholder="请输入订单ID" style="width: 120px;" class="filter-item" @keyup.enter.native="handleFilter" />
         </el-form-item>
         <el-form-item label="订单编号:" style="width:215px;float: left;">
           <el-input v-model="listQuery.orderNo" placeholder="请输入订单编号" style="width: 140px;" class="filter-item" @keyup.enter.native="handleFilter" />