chenrui 4 年之前
父节点
当前提交
74ef604fe4

+ 3 - 14
src/api/costType.js

@@ -1,20 +1,9 @@
 import { axios } from '@/utils/request'
 
-//  费用类型 列表  分页
-export const costTypeList = (params) => {
-  const url = `/costType/queryPage/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
+//  费用类型 列表
+export const costTypeAllQuery = (params) => {
   return axios({
-    url: url,
-    data: params,
-    method: 'post'
-  })
-}
-//  费用类型 列表  不分页
-export const costTypeAllList = (params) => {
-  return axios({
-    url: `/costType/queryList`,
+    url: `/costType/query`,
     data: {},
     method: 'post'
   })

+ 8 - 8
src/views/basicData/expenseType/editModal.vue

@@ -35,7 +35,7 @@
 
 <script>
 import { STable } from '@/components'
-// import { dealerProductTypeSave } from '@/api/dealerProductType'
+import { costTypeSave } from '@/api/costType'
 export default {
   name: 'ExpenseTypeEditModal',
   components: { STable },
@@ -85,13 +85,13 @@ export default {
           const formData = JSON.parse(JSON.stringify(_this.form))
           formData.id = _this.itemId ? _this.itemId : undefined
           formData.psn = _this.nowData && _this.nowData.psn ? _this.nowData.psn : undefined
-          // dealerProductTypeSave(formData).then(res => {
-          //   if (res.status == 200) {
-          //     _this.$message.success(res.message)
-          //     _this.$emit('ok')
-          //     _this.isShow = false
-          //   }
-          // })
+          costTypeSave(formData).then(res => {
+            if (res.status == 200) {
+              _this.$message.success(res.message)
+              _this.$emit('ok')
+              _this.isShow = false
+            }
+          })
         } else {
           return false
         }

+ 3 - 3
src/views/basicData/expenseType/list.vue

@@ -18,7 +18,7 @@
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button
-          v-if="record.productTypeLevel<3"
+          v-if="record.typeLevel<3"
           type="link"
           size="small"
           icon="plus"
@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { costTypeAllList, costTypeDel } from '@/api/costType'
+import { costTypeAllQuery, costTypeDel } from '@/api/costType'
 import { STable } from '@/components'
 import expenseTypeEditModal from './editModal.vue'
 export default {
@@ -70,7 +70,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        return costTypeAllList({}).then(res => {
+        return costTypeAllQuery({}).then(res => {
           //  递归去除空children
           this.recursionFun(res.data)
           if (res.data.length > 0) {

+ 1 - 1
src/views/inventoryManagement/warehouse/list.vue

@@ -35,7 +35,7 @@
         <a-divider type="vertical" style="margin: 0;" />
         <a-button size="small" type="link" @click="handleEdit(record)" id="warehouseList-edit-btn">编辑</a-button>
         <a-divider type="vertical" style="margin: 0;" />
-        <a-button size="small" type="link" @click="handleDel(record)" id="warehouseList-del-btn" style="margin-left: 10px;">删除</a-button>
+        <a-button size="small" type="link" @click="handleDel(record)" id="warehouseList-del-btn">删除</a-button>
       </template>
     </s-table>
     <!-- 新增/编辑仓库 -->

+ 1 - 1
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -41,7 +41,7 @@
         <template slot="action" slot-scope="text, record">
           <a-button size="small" type="link" @click="handleEdit(record)" id="storingLocationList-edit-btn">编辑</a-button>
           <a-divider type="vertical" style="margin: 0;" />
-          <a-button size="small" type="link" @click="handleDel(record)" id="storingLocationList-del-btn" style="margin-left: 10px;">删除</a-button>
+          <a-button size="small" type="link" @click="handleDel(record)" id="storingLocationList-del-btn">删除</a-button>
         </template>
       </s-table>
     </a-card>

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.102:8503/qpls-md',
+        target: 'http://192.168.16.103:8503/qpls-md',
         // target: 'http://it.test.zyucgj.com/zyit',
         // target: 'https://it.test.qiubcar.com/zyit',
         ws: false,