From 008a267cb1aa884efe0d7c93ff809f20d5e7322c Mon Sep 17 00:00:00 2001
From: ljx <864490211@qq.com>
Date: Tue, 26 Mar 2024 16:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B93.26?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Middle/Mes/MesStaff/MesStaff/Edit.vue     | 39 +++++++++++--------
 .../SoilQualityMaterial/List.vue              |  8 ++--
 .../TrainNumber/TrainNumber/Edit.vue          | 10 ++---
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue b/src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue
index 9587458..a08b0a8 100644
--- a/src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue
+++ b/src/pages/Middle/Mes/MesStaff/MesStaff/Edit.vue
@@ -172,15 +172,10 @@ export default {
           // 表单项
           items: [
             // =============================== 表单项 自动生成 Start ===============================
-
+            {field:'',title:'',span:24,isTitle:true,Htitle:'员工信息',itemRender:{}},//分割线
+            { field: 'name', title: '员工姓名', span: 12, itemRender: { name: '$input' } },
+            { field: 'code', title: '员工工号', span: 12, itemRender: { name: '$input' } },
             {
-              title: '左侧',
-              span: 19,
-              children: [
-                { field: 'name', title: '员工姓名', span: 12, itemRender: { name: '$input' } },
-                { field: 'code', title: '员工工号', span: 12, itemRender: { name: '$input' } },
-
-                {
                   title: '部门', span: 12,
                   field: 'base_department',
                   dataRule: {
@@ -212,17 +207,26 @@ export default {
                 { field: 'is_piecework', title: '是否计件', span: 12, itemRender: { name: '$select', props: { options: settings.options_yesorno } } },
 
                 { field: 'status', title: '状态', span: 12, itemRender: { name: '$select', props: { options: settings.options_status_staff } } },
+                { field: 'avatar',title: '头像', span: 12, itemRender: { name: 'MkFormCropper' } },
                 { field: 'remark', title: '备注', span: 24, itemRender: { name: '$input' } },
+              
 
-              ]
-            },
-            {
-              title: '右侧',
-              span: 5,
-              children: [
-                { field: 'avatar', span: 12, itemRender: { name: 'MkFormCropper' } },
-              ]
-            },
+            // {
+            //   title: '左侧',
+            //   span: 19,
+            //   children: [
+               
+
+               
+            //   ]
+            // },
+            // {
+            //   title: '右侧',
+            //   span: 5,
+            //   children: [
+               
+            //   ]
+            // },
 
 
 
@@ -289,6 +293,7 @@ export default {
 
         this.$forceUpdate()
       } else {
+        console.log( this.addModeItems)
         // 如果没有id参数，说明是新增模式
         this.addModeItems.forEach(item => {
           this.pageOptions.formOptions.items.push(item);
diff --git a/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/List.vue b/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/List.vue
index 31dbad4..568dd30 100644
--- a/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/List.vue
+++ b/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/List.vue
@@ -114,13 +114,13 @@ export default {
       },
       // 搜索区配置
       searchRules: [
-        {key: "title", mode: "like"},
-        {key: "desc", mode: "like"}
+        {key: "code", mode: "like"},
+        {key: "name", mode: "like"}
       ],
       //搜索区
       searchFormItems: [ // 子项
-        {field: 'title', title: '标题', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入标题'}}},
-        {field: 'desc', title: '描述', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}},
+        {field: 'code', title: '编码', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}},
+        {field: 'name', title: '品名', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入标题'}}},
         {span: 8, slots: {default: 'date'}},  // 自定义列
         {
           align: 'right', span: 4, itemRender: {  // 按钮列
diff --git a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
index 6d69aae..e58f115 100644
--- a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
+++ b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
@@ -194,6 +194,7 @@ export default {
           is_need_outbound: 0,
           truck_name: "",
           truck_id: 0,
+          driver_name:'',
           driver_id: 0,
           outbound_date: new Date(2100, 1, 1).getTime() / 10000,
           return_date: new Date(2100, 1, 1).getTime() / 10000,
@@ -386,11 +387,8 @@ export default {
                 }
               }
             }},
-          { field: 'driver_id',title: '司机', span: 6,
-            dataRule: {
-              fromField: "id",
-              saveField: "driver_id"
-            },
+          { field: 'driver_name',title: '司机', span: 6,
+            
             itemRender: {
               name: 'MkFormDataSelector', props: {
                 params: {
@@ -716,9 +714,7 @@ export default {
        
        
         this.formOptions.data.other_expenses_log.forEach(item => {
-          console.log(item)
           item.other_expenses_amount = Number(item.other_expenses_amount)
-          console.log("item.driver_id",item.driver_id)
         })
         let postdata = Object.assign({}, this.formOptions.data);
         // 如果是编辑模式