更新

2024-04-24 15:35:20 +08:00 · 2024-04-24 15:35:20 +08:00 · 349cb5b8dc
parent 709ade1c57
commit 349cb5b8dc
5 changed files with 38 additions and 20 deletions
--- a/src/pages/Middle/transport/Maintenance/OtherExpenses/Edit.vue
+++ b/src/pages/Middle/transport/Maintenance/OtherExpenses/Edit.vue
@ -51,7 +51,7 @@ export default {
      currentBeid: 0,

      uploadDefaultImg: null,
-      detailDataFieldName: "maintenance",
+      detailDataFieldName: "OtherExpenses",

      actions: {
        // =============================== 接口地址 自动生成 Start ===============================
@ -136,9 +136,9 @@ export default {

    };

-    pageData.actions.get = pageData.actions.MaintenanceDetail;
-    pageData.actions.create = pageData.actions.MaintenanceCreate;
-    pageData.actions.update = pageData.actions.MaintenanceUpdate;
+    pageData.actions.get = pageData.actions.OtherExpensesDetail;
+    pageData.actions.create = pageData.actions.OtherExpensesCreate;
+    pageData.actions.update = pageData.actions.OtherExpensesUpdate;

    // 合并表单数据及配置
    pageData.formOptions = Object.assign({}, this.$mk.config.defaults.formOptions, pageData.formOptions);
@ -210,7 +210,7 @@ export default {
        dataId = this.$route.params.id;
      }
      if (!dataId) {
-        dataId = 0;
+        dataId = 0;   
      }
      return dataId;
    },
@ -221,16 +221,16 @@ export default {
      // 如果是新增模式，关闭当前页面
      if (!this.isEdit) {
        this.$closePage({
-          closeRoute: "/Maintenance/MaintenanceCreate"
+          closeRoute: "/Maintenance/OtherExpensesCreate"
        });
      } else {
        // 如果是编辑模式，关闭当前页面
        this.$closePage({
-          closeRoute: "/Maintenance/MaintenanceUpdate"
+          closeRoute: "/Maintenance/OtherExpensesUpdate"
        });
      }
      // 打开列表页面
-      this.$openPage('/Maintenance/MaintenanceList')
+      this.$openPage('/Maintenance/OtherExpensesList')
    },

    // 保存
@ -245,7 +245,7 @@ export default {
        let postdata = Object.assign({}, this.formOptions.data);
        // 如果是编辑模式
        if (this.isEdit) {
-          // postdata = { Maintenance: postdata }
+          // postdata = { OtherExpenses: postdata }
        }
        // 格式化提交的数据
        this.$mk.formatFormData({data: postdata, rules: this.formOptions.items});
--- a/src/pages/Middle/transport/Maintenance/OtherExpenses/List.vue
+++ b/src/pages/Middle/transport/Maintenance/OtherExpenses/List.vue
@ -56,7 +56,7 @@
 import BASE_URL from '@/services/Middle/transport/Maintenance/api.js';

 export default {
-  name: 'MaintenanceList',
+  name: 'OtherExpensesList',
  i18n: require('./i18n'), // 国际化
  props: {
    pageMode: {
@ -73,8 +73,8 @@ export default {
      keyName: 'id', // 主键字段名
      listFieldName: 'maintenance',

-      addPageUrl: "/Maintenance/MaintenanceCreate",
-      editPageUrl: "/Maintenance/MaintenanceUpdate/",
+      addPageUrl: "/Maintenance/OtherExpensesCreate",
+      editPageUrl: "/Maintenance/OtherExpensesUpdate/",
      // 接口动作
      actions: { // Api 接口地址
        // =============================== 接口地址 自动生成 Start ===============================
@ -197,8 +197,8 @@ export default {
      }

    };
-    pageData.actions.getList = pageData.actions.MaintenanceList;
-    pageData.actions.delete = pageData.actions.MaintenanceBatchDelete;
+    pageData.actions.getList = pageData.actions.OtherExpensesList;
+    pageData.actions.delete = pageData.actions.OtherExpensesBatchDelete;
    pageData.gridOptions = Object.assign({}, this.$mk.config.defaults.gridOptions, pageData.gridOptions); // 合并表格数据

    return pageData; // 返回页面数据
@ -293,7 +293,7 @@ export default {
    // 工具栏点击事件 add / log / setting
    toolbarClick(e) {
      if (e.name == "add") { // 如果是添加
-        this.$openPage("/Maintenance/MaintenanceCreate"); // 打开页面
+        this.$openPage("/Maintenance/OtherExpensesCreate"); // 打开页面
      }
    },

@ -303,7 +303,7 @@ export default {
        this.$mk.msg("请选择行"); // 提示
        return; // 返回
      }
-      this.$openPage("/Maintenance/MaintenanceUpdate/" + row[this.keyName]); // 打开页面
+      this.$openPage("/Maintenance/OtherExpensesUpdate/" + row[this.keyName]); // 打开页面
    },

    // 删除
--- a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
+++ b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
@ -241,6 +241,7 @@ export default {
          is_driver_settlement:0, // 司机是否直接结算
          buy_unit_price:0, // 购买单价
          buy_total_price:0, // 购买总价
+          freight:0, // 运费
          // =============================== 表单数据 自动生成 End ===============================
        },
        // 标题宽度
@ -364,6 +365,9 @@ export default {
          total_price: [
            {message: '请输入总价'}
          ],
+          freight: [
+            {message: '请输入运费'}
+          ],

          // =============================== 表单校验 自动生成 End ===============================
        },
@ -526,6 +530,7 @@ export default {
          {field: 'buy_unit_price', title: '购入单价', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber } }},
          {field: 'buy_total_price', title: '购入总价', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},

+       


          // {field: 'warehousing_soil_quality_material_id',title: '入库物料土质',span: 8, itemRender: {name: '$input'}},
@ -536,6 +541,7 @@ export default {
          // {field: 'is_customer_settlement', title: '客户直接结算', span: 24, itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
          // {field: 'is_supplier_settlement', title: '供应商直接结算', span: 24, itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
          // {field: 'is_driver_settlement', title: '司机直接结算', span: 24, itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},
+          {field: 'freight', title: '运费', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
          {field: 'is_oil', title: '是否加油', span: 24,itemRender: { name: '$switch', props: { openLabel: '是', openValue: 1, closeValue: 0, closeLabel: '否' } }},

          {field:'',title:'',span:24,isTitle:true,Htitle:'司机补贴',itemRender:{}},//分割线
--- a/src/pages/Middle/transport/Truck/Truck/Edit.vue
+++ b/src/pages/Middle/transport/Truck/Truck/Edit.vue
@ -182,7 +182,7 @@ export default {
            {field: 'code', title: '编码', span: 12, itemRender: {name: '$input'}},
            {field: 'name', title: '名称', span: 12, itemRender: {name: '$input'}},
            {field: 'plate_number', title: '车牌号', span: 6, itemRender: {name: '$input'}},
-            {field: 'type', title: '类型', span: 6, itemRender: {name: '$input'}},
+            {field: 'type', title: '类型', span: 6, itemRender: { name: '$select', props: { options:[{value:"本地车队",label:"本地车队"},{value:"外运车队",label:"外运车队"}] } }},
            {field: 'manager_name', title: '负责人姓名', span: 6, itemRender: {name: '$input'}},
            {field: 'manager_phone', title: '负责人电话', span: 6, itemRender: {name: '$input'}},
            {field: 'current_distance', title: '车辆当前公里数', span: 6, itemRender: {name: '$input',props:{type:'number'}}},
--- a/src/router/Middle/transport/Maintenance/router.map.js
+++ b/src/router/Middle/transport/Maintenance/router.map.js
@ -139,11 +139,11 @@ const MaintenanceRouterMap = {
    },
    
    OtherExpensesList: {
-        name: '其他费用项目列表',
+        name: '费用项目列表',
        icon: 'idcard',
        path: '/Maintenance/OtherExpensesList',
        meta: {
-        invisible: true, // 不在菜单中显示
+        invisible: false, // 不在菜单中显示
        },
        component: () => import('@/pages/Middle/transport/Maintenance/OtherExpenses/List'),
        authority: {
@ -151,7 +151,7 @@ const MaintenanceRouterMap = {
        }
    },
    OtherExpensesCreate: {
-        name: '创建其他费用项目',
+        name: '创建费用项目',
        icon: 'idcard',
        path: '/Maintenance/OtherExpensesCreate',
        meta: {
@ -162,6 +162,18 @@ const MaintenanceRouterMap = {
        permission: ["Maintenance","Maintenance-All","Other-Expenses-Create"],
        }
    },
+    OtherExpensesUpdate: {
+        name: '创建费用项目',
+        icon: 'idcard',
+        path: '/Maintenance/OtherExpensesUpdate/:id',
+        meta: {
+        invisible: true, // 不在菜单中显示
+        },
+        component: () => import('@/pages/Middle/transport/Maintenance/OtherExpenses/Edit'),
+        authority: {
+        permission: ["Maintenance","Maintenance-All","Other-Expenses-Update"],
+        }
+    },

 }