From 4529931416b81d7971d20206b215106ea1284fbd Mon Sep 17 00:00:00 2001
From: ljx <864490211@qq.com>
Date: Sat, 11 May 2024 11:11:45 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=8F=AF=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=202.=E5=9C=A8=E5=88=9B=E5=BB=BA=E8=BD=A6?=
 =?UTF-8?q?=E6=AC=A1=E7=9A=84=E6=9C=80=E4=B8=8B=E6=96=B9=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=85=8D=E4=BB=B6=E8=B4=B9=EF=BC=8C=E7=94=B5=E5=99=A8?=
 =?UTF-8?q?=E8=B4=B9=EF=BC=8C=E8=BD=AE=E8=83=8E=E5=B7=A5=E8=B4=B9=E4=B8=89?=
 =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editors/MkGridDataSelector.vue |  6 +++++
 .../TrainNumber/TrainNumber/Edit.vue          | 25 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/src/application/mk/components/editors/MkGridDataSelector.vue b/src/application/mk/components/editors/MkGridDataSelector.vue
index a5b8130..2387754 100644
--- a/src/application/mk/components/editors/MkGridDataSelector.vue
+++ b/src/application/mk/components/editors/MkGridDataSelector.vue
@@ -95,7 +95,9 @@ export default {
       });
     },
     load() {
+      console.log(column)
       const { row, column } = this.params
+   
 
       this.row = row
       this.column = column
@@ -252,6 +254,10 @@ export default {
       }).catch(() => {
         this.loading = false;
       });
+      //新增，如果free Change，可自由更改input信息，非固定匹配
+      if(column.params.freeChange){
+        this.row[column.field] = this.textboxValue;
+      }
     },
     suffixClick() {
       this.$refs.xDown.togglePanel()
diff --git a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
index f31c24b..9fa3178 100644
--- a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
+++ b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
@@ -156,6 +156,22 @@
           
         </vxe-table>
       </div>
+      <vxe-form :data="formOptions.data" ref="xForm2" :title-width="formOptions.titleWidth"
+                :title-align="formOptions.titleAlign" :rules="formOptions.rules" titleColon>
+        <!--  =========================== 自定义区域 Start  ======================= -->
+        <vxe-form-item v-for="(item,index) in formOptions3.items" :title="item.title" :field="item.field"   :span="item.span" :key="index" :item-render="item.itemRender" :visible="isShow(item)">
+          <div v-if="item.isTitle" class="Htitle">
+            <div class="left-line"></div>
+            <p class="Htitle-p">
+              {{ item.Htitle }}
+            </p>
+            <div style="padding-right: 10px;" v-if="item.needAdd && !isEdit"><vxe-button size="small" status="primary" @click="addTrainNumber" content="新增车次"></vxe-button></div>
+            <div class="right-line"></div>
+          </div>
+        </vxe-form-item>
+        <!--  =========================== 自定义区域 End  ======================= -->
+      </vxe-form>
+
       <div class="footerbar">
         <a-button type="primary" @click="ok">确定</a-button>
         <a-button @click="cancel">取消</a-button>
@@ -226,6 +242,7 @@ export default {
           placeholder: "请输入名称或者编号",
           searchFieldNames: ['name'],
           textField: 'name',
+          freeChange: true,
           dataUrl: `${BASE_URL.BASE_URL}/Maintenance/v1/other/expenses/list`
       },
       editorMaintenance: {
@@ -240,6 +257,7 @@ export default {
           placeholder: "请输入名称或者编号",
           searchFieldNames: ['name'],
           textField: 'name',
+          freeChange: true,
           dataUrl: `${BASE_URL.BASE_URL}/Maintenance/v1/maintenance/list`
       },
       // 表单数据
@@ -657,6 +675,13 @@ export default {
           {field: "oil_consumption_remark", title: '油耗备注', span: 24, itemRender: {name: '$textarea'}},
         ]  
       },
+      formOptions3:{
+        items:[
+          {field: 'accessories_fee', title: '配件费', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
+          {field: 'tire_fee', title: '轮胎工费', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
+          {field: 'electric_fee', title: '电器费', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
+      ]
+      },
       train_numberOptions: {
         items: [
         {field: 'custom_name', title: '选择客户', span: 8, itemRender: {