From 1c9ccd5da09c1e4f7601e3f0ae820c8557a4f6a8 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Mon, 8 Apr 2024 20:04:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E6=89=98=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/basicdata/basicdataTray.js         | 17 ++++++++++++++
 .../warehouse/tray/basicdataTrayedt.vue       | 23 +++++++++++++++++++
 .../Financialse/FinancialWarehousing.vue      |  1 +
 3 files changed, 41 insertions(+)

diff --git a/src/option/basicdata/basicdataTray.js b/src/option/basicdata/basicdataTray.js
index 57ef814f..fbb1b3e2 100644
--- a/src/option/basicdata/basicdataTray.js
+++ b/src/option/basicdata/basicdataTray.js
@@ -74,6 +74,23 @@ export default {
       hide: true,
       width: '130',
     },
+    {
+      label: '打托方式',
+      prop: 'trayType',
+      type: 'select',
+      search: true,
+      dicUrl: '/api/blade-system/dict-biz/dictionary?code=pallet_order_type',
+      props: {
+        label: 'dictValue',
+        value: 'dictKey',
+      },
+      align: 'center',
+      labelWidth: '100',
+      addDisplay: true,
+      editDisplay: true,
+      viewDisplay: true,
+      width: '130',
+    },
     {
       label: '状态',
       prop: 'status',
diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
index 4d79305f..b5bec8dc 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
@@ -14,6 +14,9 @@
         <el-col :xl="7" :lg="7" :md="8" :sm="24">
           <span>类 型：{{ traydata.$type }} </span>
         </el-col>
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span>打托方式：{{ traydata.trayType }} </span>
+        </el-col>
       </el-row>
 
       <el-divider>在 托 货 物</el-divider>
@@ -619,6 +622,17 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'orderPackageCode',
           label: '包条码',
@@ -1424,6 +1438,15 @@ export default {
       //查询详情
       const data = decodeURIComponent(this.$route.query.data);
       this.traydata = JSON.parse(data);
+      getDictionaryBiz('pallet_order_type').then(res => {
+        console.log(res,'打托字典');
+        // 解码打托
+        if(res.data.code ==200){
+          if(res.data.data.length){
+            this.traydata.trayType = res.data.data.find(res=>res.dictKey==   this.traydata.trayType).dictValue
+          }
+        }
+      });
       console.log('data>>>>>>>>', this.traydata);
       this.loading = true;
       // getDetail(id).then(res => {
diff --git a/src/views/financialsector/Financialse/FinancialWarehousing.vue b/src/views/financialsector/Financialse/FinancialWarehousing.vue
index 27c27d7f..2a5f343b 100644
--- a/src/views/financialsector/Financialse/FinancialWarehousing.vue
+++ b/src/views/financialsector/Financialse/FinancialWarehousing.vue
@@ -233,6 +233,7 @@
         </div>
       </div>
     </div>
+    <div>保存</div>
   </div>
 </template>