4

.env.development

@@ -4,8 +4,8 @@ ENV = 'development'
 # 正式环境
 #VUE_APP_BASE_API = 'http://sjapi.jxhh.com'
 # 开发环境
-#VUE_APP_BASE_API = 'http://192.168.111.36:8200'
-VUE_APP_BASE_API = 'http://192.168.26.179:8200'
+VUE_APP_BASE_API = 'http://192.168.111.34:8200'
+#VUE_APP_BASE_API = 'http://192.168.26.179:8200'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/module/freight.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询freight列表
 export function listFreight(query) {
     return request({
-        url: '/system/freight/list',
+        url: '/system/freightNew/list',
         method: 'get',
         params: query
     })
@@ -12,7 +12,7 @@ export function listFreight(query) {
 // 查询freight详细
 export function getFreight (id) {
     return request({
-        url: '/system/freight/edit?id='+id,
+        url: '/system/freightNew/edit?id='+id,
         method: 'get'
     })
 }
@@ -21,7 +21,7 @@ export function getFreight (id) {
 // 新增freight
 export function addFreight(data) {
     return request({
-        url: '/system/freight/add',
+        url: '/system/freightNew/add',
         method: 'post',
         data: data
     })
@@ -30,7 +30,7 @@ export function addFreight(data) {
 // 修改freight
 export function updateFreight(data) {
     return request({
-        url: '/system/freight/edit',
+        url: '/system/freightNew/edit',
         method: 'post',
         data: data
     })
@@ -39,9 +39,9 @@ export function updateFreight(data) {
 // 删除freight
 export function delFreight(ids) {
     return request({
-        url: '/system/freight/delete',
+        url: '/system/freightNew/delete',
         method: 'delete',
-        data:{ids:ids}
+        data:{id:ids}
     })
 }
 

src/views/system/asset/verifyrecord/index.vue

@@ -144,7 +144,7 @@
         queryParams: {
           page: 1,
           limit: 10,
-          shopId: 0,
+          // seller_id: 0,
           money: null,
           org_money: null,
           freight: null,
@@ -222,21 +222,21 @@
       // 表单重置
       reset() {
         this.form = {
-          id: null,
-          shop_id: null,
-          money: null,
-          org_money: null,
-          freight: null,
-          bill_money: null,
-          disc_money: null,
-          refund_money: null,
-          real_bill_money: null,
-          integral_cost_money: null,
-          pt_disc_money: null,
-          score_back: null,
-          status: 0,
-          time: null,
-          confirm_time: null
+          // id: null,
+          // seller_id: null,
+          // money: null,
+          // org_money: null,
+          // freight: null,
+          // bill_money: null,
+          // disc_money: null,
+          // refund_money: null,
+          // real_bill_money: null,
+          // integral_cost_money: null,
+          // pt_disc_money: null,
+          // score_back: null,
+          // status: 0,
+          // time: null,
+          // confirm_time: null
         };
         this.resetForm("form");
       },

src/views/system/freight/freight_list/index.vue

@@ -62,8 +62,8 @@
       <pagination
         v-show="total>0"
         :total="total"
-        :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.limit"
         @pagination="getList"
       />
       <!-- 添加或修改freight对话框 -->
@@ -104,8 +104,8 @@
         isOpen: false,
         // 查询参数
         queryParams: {
-          pageNum: 1,
-          pageSize: 20,
+          page: 1,
+          limit: 20,
           seller_id: null,
           name: null,
           sort: null,
@@ -223,7 +223,7 @@
       },
       /** 搜索按钮操作 */
       handleQuery() {
-        this.queryParams.pageNum = 1;
+        this.queryParams.page = 1;
         this.getList();
       },
       /** 重置按钮操作 */
@@ -270,10 +270,11 @@
         this.reset();
         const id = row.Id
         getFreight(id).then(response => {
-          let formdate = response.data
-          response.data.Dispatching = JSON.parse(formdate.Dispatching)
+          let formdate = response.data.info
+          debugger
+          response.data.info.Dispatching = JSON.parse(formdate.Dispatching)
           //console.log("点击修改获取的数据：",response.data.Dispatching);
-          this.form = response.data
+          this.form = response.data.info
           this.isOpen = true;
           this.title = "修改运费模板";
         });
@@ -310,6 +311,7 @@
       /** 删除按钮操作 */
       handleDelete(row) {
         const ids = row.Id || this.ids;
+        debugger
         this.$confirm('是否确认删除运费模板编号为“' + ids + '"的数据？','警告',{
           confirmButtonText: '确定',
           cancelButtonText: '取消',