From d0b4ce581c4e42d77c4a7e0d146dd3a0c428e29e Mon Sep 17 00:00:00 2001
From: ljx <864490211@qq.com>
Date: Mon, 29 Apr 2024 18:10:17 +0800
Subject: [PATCH] 4.29

---
 .../SoilQualityMaterial/Edit.vue              |  1 +
 .../TrainNumber/TrainNumber/Edit.vue          | 32 +++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/Edit.vue b/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/Edit.vue
index 1c5611b..27fcb77 100644
--- a/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/Edit.vue
+++ b/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/Edit.vue
@@ -171,6 +171,7 @@ export default {
             {field:'',title:'',span:24,isTitle:true,Htitle:'土质物料信息',itemRender:{}},//分割线
             {field: 'code', title: '编码', span: 6, itemRender: {name: '$input'}},
             {field: 'name', title: '品名', span: 6, itemRender: {name: '$input'}},
+            {field: 'price', title: '单价', span: 6, itemRender: {name: '$input'}},
             {field: 'image', title: '图片', span: 24, itemRender: {name: 'MkFormCropper', props: {}}},
             {field: 'description', title: '描述', span: 24, itemRender: {name: '$textarea'}},
             {field: 'remark', title: '备注', span: 24, itemRender: {name: '$textarea'}},
diff --git a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
index c0557f3..bd846ff 100644
--- a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
+++ b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
@@ -89,7 +89,7 @@
             </template>
           </vxe-column>
           <vxe-column type="seq" width="60"></vxe-column>
-          <vxe-column field="maintenance_name" title="维修项目" :edit-render="{ name: '$input' }"></vxe-column>
+          <vxe-column field="maintenance_name" title="维修项目" :params="editorMaintenance"  :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
           <vxe-column field="maintenance_price" title="维修金额" formatter="formatNumber"  :edit-render="{ name: '$input',props: { type: 'number' } }"></vxe-column>
           <vxe-column field="maintenance_description" title="维修内容" :edit-render="{ name: '$input' }"></vxe-column>
           
@@ -147,7 +147,7 @@
             </template>
           </vxe-column>
           <vxe-column type="seq" width="60"></vxe-column>
-          <vxe-column field="other_expenses_name" title="费用项目名称" :edit-render="{ name: '$input'}"></vxe-column>
+          <vxe-column field="other_expenses_name" title="费用项目名称" :params="editorOther"  :edit-render="{ name: 'MkGridDataSelector' }"></vxe-column>
           <vxe-column field="other_expenses_amount" title="费用金额" formatter="formatNumber" :edit-render="{ name: '$input',props: { type: 'number' } }"></vxe-column>
           <vxe-column field="other_expenses_remark" title="备注" :edit-render="{ name: '$input' }"></vxe-column>
           
@@ -211,6 +211,34 @@ export default {
       keyName: 'id',
       // 是否编辑模式
       isEdit: false,
+      editorOther: {
+          name: "OtherExpenses",
+          modelName: "OtherExpenses",
+          listdataFieldName:'OtherExpenses',
+          columns: [
+            { field: 'name', title: '名称' },
+            { field: 'code', title: '编号' }
+          ],
+          dataType:'string',
+          placeholder: "请输入名称或者编号",
+          searchFieldNames: ['name'],
+          textField: 'name',
+          dataUrl: `${BASE_URL.BASE_URL}/Maintenance/v1/other/expenses/list`
+      },
+      editorMaintenance: {
+          name: "Maintenance",
+          modelName: "Maintenance",
+          listdataFieldName:'Maintenance',
+          columns: [
+            { field: 'name', title: '名称' },
+            { field: 'code', title: '编号' }
+          ],
+          dataType:'string',
+          placeholder: "请输入名称或者编号",
+          searchFieldNames: ['name'],
+          textField: 'name',
+          dataUrl: `${BASE_URL.BASE_URL}/Maintenance/v1/maintenance/list`
+      },
       // 表单数据
       formOptions: {
         data: {