feat:新增费用类型

src/api/goods.js

@@ -99,3 +99,9 @@ export function deleteSkuValue(data) {
 export function getSkuList(data) {
   return httpRequest.post('/api/shop/commodity/spu/spec/value/search', data)
 }
+/**
+ * 获取费用类型
+ */
+export function getFeeTypes(data) {
+  return httpRequest.get('/api/zws/v1/finance/payments/payments-type')
+}

src/components/goods/skuView.vue

@@ -75,9 +75,9 @@ export default {
     return {
       header: [
         { formType: 'input', key: 'price', value: '*价格（元）' },
-        { formType: 'input', key: 'mark_price', value: '划线价（元）' },
+        { formType: 'input', key: 'mark_price', value: '*划线价（元）' },
         { formType: 'input', key: 'stock', value: '*库存' },
-        { formType: 'input', key: 'prime_price', value: '成本价' },
+        { formType: 'input', key: 'prime_price', value: '*成本价' },
         { key: 'sales_volume', value: '销量' }
       ],
       showBatchInput: false,

src/pages/goods/goods/edit.vue

@@ -56,6 +56,11 @@
             <el-option v-for="item in groupList" :label="item.group_name" :value="item.group_id" :key="item.group_id" />
           </el-select>
         </el-form-item>
+        <el-form-item label="费用类型" prop="payment_type">
+          <el-select v-model="ruleForm.payment_type" placeholder="选择费用类型">
+            <el-option v-for="item in feeTypeList" :label="item.name" :value="item.type" :key="item.type" />
+          </el-select>
+        </el-form-item>
       </app-card>
 
       <app-card title="价格库存">
@@ -185,6 +190,7 @@ export default {
         chart_oss: [],
         main_chart_oss: '',
         group_id: '', // 商品分组
+        payment_type: '', // 费用类型
         sales_type: '1', // 开售方式 1、立即开售 2、定时开售 3、放入仓库
         buy_button_text: '立即购买', // 购买按钮文字
         spu_context: '', // 商品详情
@@ -201,6 +207,7 @@ export default {
       rules: {
         spu_name: [{ required: true, message: '商品名称不可为空', trigger: 'blur' }],
         chart_oss: [{ required: true, message: '最少需要添加一张商品图', trigger: 'blur' }],
+        payment_type: [{ required: true, message: '请选择费用类型', trigger: 'blur' }],
         buy_button_text: [
           { validator: chineseEnglishValid, trigger: 'blur' },
           { validator: goodsBuyBtnValid, trigger: 'blur' }
@@ -215,6 +222,9 @@ export default {
     groupList() {
       return this.$store.state.groups
     },
+    feeTypeList() {
+      return this.$store.state.feeTypes
+    },
     pid() {
       return this.$route.params.id || this.$route.query.id
     }
@@ -228,6 +238,8 @@ export default {
       }
       // 获取商品分组
       this.$store.dispatch('getGroups')
+      // 获取费用类型
+      this.$store.dispatch('getFeeTypes')
     },
     // 修改渲染
     editRender() {
@@ -315,7 +327,12 @@ export default {
           const goodStockList = this.ruleForm.goodStockList
           if (goodStockList && goodStockList.length) {
             for (const item of goodStockList) {
-              if (isNaN(parseFloat(item.price)) || isNaN(parseFloat(item.stock))) {
+              if (
+                isNaN(parseFloat(item.price)) ||
+                isNaN(parseFloat(item.prime_price)) ||
+                isNaN(parseFloat(item.mark_price)) ||
+                isNaN(parseFloat(item.stock))
+              ) {
                 this.$message({ message: '请完善规格明细表单', type: 'error' })
                 return false
               }

src/store/index.js

@@ -3,7 +3,7 @@ import Vuex from 'vuex'
 
 import { getUser, logout } from '@/api/base'
 import { getShopList } from '@/api/shop'
-import { getGroupList } from '@/api/goods'
+import { getGroupList, getFeeTypes } from '@/api/goods'
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
@@ -22,7 +22,9 @@ const store = new Vuex.Store({
       { label: '美国康博斯威尔大学教育学硕士', value: '1005' },
       { label: '中国未来金融领袖计划', value: '1007' },
       { label: '道路运输企业', value: '5001' }
-    ]
+    ],
+    // 费用类型
+    feeTypes: []
   },
   mutations: {
     setUser(state, user) {
@@ -37,6 +39,9 @@ const store = new Vuex.Store({
     },
     setGroups(state, list) {
       state.groups = list
+    },
+    setFeeTypes(state, list) {
+      state.feeTypes = list
     }
   },
   actions: {
@@ -70,6 +75,21 @@ const store = new Vuex.Store({
           commit('setGroups', [])
         })
     },
+    // 获取费用类型列表
+    getFeeTypes({ commit, state }) {
+      getFeeTypes()
+        .then(response => {
+          const { data = [] } = response
+          const list = data.map(item => {
+            item.type = item.type.toString()
+            return item
+          })
+          commit('setFeeTypes', list)
+        })
+        .catch(() => {
+          commit('setFeeTypes', [])
+        })
+    },
     // 设置店铺id
     setShopId({ commit }, shopId) {
       commit('setShopId', shopId)