From 7b42febc6d374313c9df7fc8db84f23e9044d65a Mon Sep 17 00:00:00 2001
From: zxx <47968546@163.com>
Date: Thu, 28 Mar 2024 17:52:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Middle/transport/Custom/Custom/Detail.vue | 11 ++++--
 .../Middle/transport/Custom/Custom/List.vue   | 10 ++---
 .../SoilQualityMaterial/List.vue              |  4 +-
 src/pages/Middle/transport/Tire/Tire/List.vue | 12 +++---
 .../TrainNumber/TrainNumber/Edit.vue          | 38 ++++++++++---------
 5 files changed, 42 insertions(+), 33 deletions(-)

diff --git a/src/pages/Middle/transport/Custom/Custom/Detail.vue b/src/pages/Middle/transport/Custom/Custom/Detail.vue
index d6f42b9..7aeb356 100644
--- a/src/pages/Middle/transport/Custom/Custom/Detail.vue
+++ b/src/pages/Middle/transport/Custom/Custom/Detail.vue
@@ -66,13 +66,16 @@
 
         <div class="btns">
           <!-- 增加结余按钮 -->
-          <a-popconfirm title="是否增加结余？" ok-text="确认" cancel-text="取消" @confirm="addBalance" @cancel="cancel">
+          <!-- <a-popconfirm title="是否增加结余？" ok-text="确认" cancel-text="取消" @confirm="addBalance" @cancel="cancel">
             <a-button class="btn-add-balance" type="primary">增加结余</a-button>
-          </a-popconfirm>
+          </a-popconfirm> -->
+          
+          <a-button class="btn-add-balance" type="primary" @click="addBalance">增加结余</a-button>
           <!-- 减少结余按钮 -->
-          <a-popconfirm title="是否减少结余？" ok-text="确认" cancel-text="取消" @confirm="reduceBalance" @cancel="cancel">
+          <!-- <a-popconfirm title="是否减少结余？" ok-text="确认" cancel-text="取消" @confirm="reduceBalance" @cancel="cancel">
             <a-button class="btn-reduce-balance" type="danger"> 减少结余</a-button>
-          </a-popconfirm>
+          </a-popconfirm> -->
+          <a-button class="btn-reduce-balance" type="danger" @click="reduceBalance"> 减少结余</a-button>
 
         </div>
       </li>
diff --git a/src/pages/Middle/transport/Custom/Custom/List.vue b/src/pages/Middle/transport/Custom/Custom/List.vue
index 088cb5a..b906873 100644
--- a/src/pages/Middle/transport/Custom/Custom/List.vue
+++ b/src/pages/Middle/transport/Custom/Custom/List.vue
@@ -177,11 +177,11 @@ export default {
 
           {field: 'code', sortable: true, title: '编码', width: 150}, // 编码
           {field: 'name',  title: '名称', width: 150}, // 名称
-          {field: 'type', sortable: true, title: '类型',formatter: this.formatType, width: 150}, // 客户类型
-          {field: 'industry', sortable: true, title: '行业', width: 150}, // 客户行业
-          {field: 'contact',  title: '联系人', width: 150}, // 客户联系人
-          {field: 'total_balance', sortable: true, title: '总结余', width: 150}, // 总结余
-          {field: 'contact_phone', sortable: true, title: '联系人电话', width: 150}, // 客户联系人电话
+          {field: 'type', sortable: true, title: '类型',formatter: this.formatType, width: 120}, // 客户类型
+          {field: 'industry', sortable: true, title: '行业', width: 120}, // 客户行业
+          {field: 'contact',  title: '联系人', width: 120}, // 客户联系人
+          {field: 'total_balance', sortable: true, title: '总结余(元)', width: 120}, // 总结余
+          {field: 'contact_phone', sortable: true, title: '联系人电话', width: 120}, // 客户联系人电话
           {field: 'total_ton', sortable: true, title: '总计交易吨数', width: 150}, // 总计交易吨数
           {field: 'total_count', sortable: true, title: '总计交易次数', width: 150}, // 总计交易次数
           {field: 'last_time', sortable: true, title: '最后交易时间',formatter: 'formatDate', width: 250}, // 最后交易时间
diff --git a/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/List.vue b/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/List.vue
index 2e97bd1..ba4d0b6 100644
--- a/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/List.vue
+++ b/src/pages/Middle/transport/SoilQualityMaterial/SoilQualityMaterial/List.vue
@@ -119,8 +119,8 @@ export default {
       ],
       //搜索区
       searchFormItems: [ // 子项
-        {field: 'code', title: '编码', span: 5, itemRender: {name: '$input', props: {placeholder: '请输入描述'}}},
-        {field: 'name', 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/Tire/Tire/List.vue b/src/pages/Middle/transport/Tire/Tire/List.vue
index 4b9811f..1ab4de2 100644
--- a/src/pages/Middle/transport/Tire/Tire/List.vue
+++ b/src/pages/Middle/transport/Tire/Tire/List.vue
@@ -31,13 +31,15 @@
       <vxe-grid ref='xGrid' v-bind="gridOptions">
 
         <!-- =============================== 表格列 自动生成 Start =============================== -->
-
+        <template #tire_type="{row}">
+          {{row.tire_type == 1 ? '更换' : '补胎'}}
+        </template>"
         <!-- =============================== 表格列 自动生成 End =============================== -->
 
         <template #op="{ row }">
           <div class="oplinks">
             <a @click.stop="pageEdit(row)" title="编辑">
-              <a-icon type="edit"/>
+              <a-button type="primary">轮胎作废</a-button>
             </a>
             <a @click.stop="pageDelete(row)" title="删除">
               <a-icon type="delete"/>
@@ -167,15 +169,15 @@ export default {
 
 
           // {field: 'truck_number_id', sortable: true, title: '车次id', width: 120}, // 车次id
-          {field: 'truck_number_code', sortable: true, title: '车次单号', width: 120}, // 车次单号
+          // {field: 'truck_number_code', sortable: true, title: '车次单号', width: 120}, // 车次单号
           {field: 'truck_code', sortable: true, title: '车辆编码', width: 120}, // 车辆编码
           {field: 'truck_name', sortable: true, title: '车辆名称', width: 120}, // 车辆名称
           {field: 'truck_number', sortable: true, title: '车牌号', width: 120}, // 车牌号
-          {field: 'tire_type', sortable: true, title: '类型', width: 70}, // 轮胎更换类型: 1.更换,2.补胎
+          {field: 'tire_type', sortable: true, title: '类型', width: 70 ,slots:{ default:"tire_type"}}, // 轮胎更换类型: 1.更换,2.补胎
           {field: 'tire_brand', sortable: true, title: '品牌', width: 100}, // 轮胎品牌
           {field: 'tire_model', sortable: true, title: '型号', width: 100}, // 轮胎型号
           {field: 'tire_count', sortable: true, title: '更换数量', width: 100}, // 轮胎更换数量
-          {field: 'tire_price', sortable: true, title: '价格', width: 120}, // 轮胎更换价格
+          {field: 'tire_price', sortable: true, title: '价格(元)', width: 120}, // 轮胎更换价格
           {field: 'tire_number', sortable: true, title: '胎号', width: 150}, // 轮胎胎号
           {field: 'old_tire_number', sortable: true, title: '旧胎号', width: 150}, // 轮胎更换旧胎号
           {field: 'last_mileage', sortable: true, title: '更换时公里数', width: 130}, // 更换公里数
diff --git a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
index 8a1869a..167f105 100644
--- a/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
+++ b/src/pages/Middle/transport/TrainNumber/TrainNumber/Edit.vue
@@ -434,10 +434,14 @@ export default {
             span: 6,
             itemRender: {name: '$input', props: {type: "date"}}
           },
+          
           {field: 'end_mileage',isNeedOutbound:true, title: '结束公里数', span: 6, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
+          
+          {field: 'outbound_remark', title: '出车备注', span: 24, itemRender: {name: '$textarea'}},
+          
           // {field: 'outbound_mileage',isNeedOutbound:true,title: '出车公里数',span: 6,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
           {field:'',title:'',span:24,isTitle:true,Htitle:'基础信息',itemRender:{}},//分割线
-          {field: 'custom_name', title: '选择客户', span: 6, itemRender: {
+          {field: 'custom_name', title: '选择客户', span: 8, itemRender: {
               name: 'MkFormDataSelector', props: {
                 params: {
                   dataType: "string",
@@ -461,7 +465,7 @@ export default {
                 }
               }
             }},
-          {field: 'supplier_name', title: '选择供应商', span: 6, itemRender: {
+          {field: 'supplier_name', title: '选择供应商', span: 8, itemRender: {
               name: 'MkFormDataSelector', props: {
                 params: {
                   dataType: "string",
@@ -485,7 +489,7 @@ export default {
                 }
               }
             }},
-          {field: 'soil_quality_material', title: '选择物料', span: 6, itemRender: {
+          {field: 'soil_quality_material', title: '选择运输物品', span: 8, itemRender: {
               name: 'MkFormDataSelector', props: {
                 params: {
                   dataType: "string",
@@ -510,25 +514,25 @@ export default {
               }
             }},
 
+   
+
+          // {field: 'outbound_soil_quality_material_id', title: '出库物料土质', span: 8, itemRender: {name: '$input'}},
+          {field: 'supplier_outbound_tonnage',title: '供应商出库吨位',span: 8,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
+          {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'}},
+          {field: 'customer_warehousing_tonnage',title: '客户入库吨位',span: 8,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
+          {field: 'unit_price', title: '单价', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber } }},
+          {field: 'total_price', title: '总价', span: 8, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
+         
           {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:'',title:'',span:24,isTitle:true,Htitle:'吨位消息',itemRender:{}},//分割线
 
-          {field: 'outbound_soil_quality_material_id', title: '出库物料土质', span: 8, itemRender: {name: '$input'}},
-          {field: 'supplier_outbound_tonnage',title: '供应商出库吨位',span: 6,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
-          {field: 'buy_unit_price', title: '购入单价', span: 5, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber } }},
-          {field: 'buy_total_price', title: '购入总价', span: 5, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
-
-
-
-          {field: 'warehousing_soil_quality_material_id',title: '入库物料土质',span: 8, itemRender: {name: '$input'}},
-          {field: 'customer_warehousing_tonnage',title: '客户入库吨位',span: 6,itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
-          {field: 'unit_price', title: '单价', span: 5, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber } }},
-          {field: 'total_price', title: '总价', span: 5, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},
-          {field: 'outbound_remark', title: '出车备注', span: 24, itemRender: {name: '$textarea'}},
-         
           {field:'',title:'',span:24,isTitle:true,Htitle:'司机补贴',itemRender:{}},//分割线
         
           {field: 'driver_subsidy', title: '补贴金额', span: 12, itemRender: {name: '$input', props: {type: "number"}, events: { input: this.handleInputNumber }}},