From 95cc1e8225ed36e8f22ebd5b948b5fd1c2c34c75 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Sat, 25 May 2024 23:57:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aftersales/aftersalesWorkOrderAdd.vue     |  12 +-
 .../aftersales/aftersalesWorkOrdermodify.vue  |   4 +-
 .../aftersalesWorkOrdermodifyTemp.vue         |  35 ++++
 .../warehouse/tray/basicdataTrayedt.vue       | 196 +++++++++---------
 4 files changed, 141 insertions(+), 106 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue
index a50641c3..6799cd40 100644
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@@ -580,7 +580,7 @@
                     <el-form-item
                       label="金额"
                       :prop="`Claimamount[${index}.money]`"
-                      :rules="ruleForm.packageCode"
+                      :rules="ruleForm.money"
                     >
                       <el-input-number
                         v-model="item.money"
@@ -596,14 +596,14 @@
                     <el-form-item
                       label="支付单位"
                       :prop="`Claimamount[${index}.paymentUnit]`"
-                      :rules="ruleForm.packageCode"
+                      :rules="ruleForm.paymentUnit"
                     >
                       <el-input v-model="item.paymentUnit" placeholder="请输入支付单位" clearable />
                     </el-form-item>
                     <el-form-item
                       label="理赔支付时间"
                       :prop="`Claimamount[${index}.compensationTime]`"
-                      :rules="ruleForm.packageCode"
+                      :rules="ruleForm.compensationTime"
                     >
                       <el-date-picker
                         v-model="item.compensationTime"
@@ -617,7 +617,7 @@
                     <el-form-item
                       label="支付方式"
                       :prop="`Claimamount[${index}.compensationMethod]`"
-                      :rules="ruleForm.packageCode"
+                      :rules="ruleForm.compensationMethod"
                     >
                       <el-select
                         v-model="item.compensationMethod"
@@ -837,9 +837,9 @@ const ruleForm = reactive({
   description: [{ required: true, message: '请输入说明', trigger: ['bulr', 'change'] }],
   money: [{ required: true, message: '请输入金额', trigger: ['bulr', 'change'] }],
   paymentUnit: [{ required: true, message: '请输入支付单位', trigger: ['bulr', 'change'] }],
-  compensationTime: [{ required: true, message: '请输选择支付时间', trigger: ['bulr', 'change'] }],
+  compensationTime: [{ required: true, message: '请选择理赔支付时间', trigger: ['bulr', 'change'] }],
   compensationMethod: [
-    { required: true, message: '请输选择支付方式', trigger: ['bulr', 'change'] },
+    { required: true, message: '请选择支付方式', trigger: ['bulr', 'change'] },
   ],
 });
 const ResponsibleParty = ref([]); //提货责任方
diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue
index d67abeb6..0de7cda6 100644
--- a/src/views/aftersales/aftersalesWorkOrdermodify.vue
+++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue
@@ -616,7 +616,7 @@
     </el-tabs>
 
     <!-- 完结原因 -->
-    <div class="arbitrate" v-if="CompensationParty.length">
+    <div class="arbitrate">
       <el-tabs type="border-card" class="demo-tabs">
         <el-tab-pane>
           <template #label>
@@ -631,7 +631,7 @@
             type="textarea"
             :autosize="{ minRows: 5, maxRows: 4 }"
             placeholder="请输入仲裁原因"
-            :disabled="ProcessingresultsState"
+            :disabled="CompleteDisabling"
           />
         </el-tab-pane>
       </el-tabs>
diff --git a/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue b/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue
index 12114568..c9ddd1c1 100644
--- a/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue
+++ b/src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue
@@ -440,6 +440,8 @@
                       style="width: 100%"
                       filterable
                       clearable
+                      allow-create
+                      default-first-option
                     >
                       <el-option
                         v-for="items in item.ResponsibleoNameptions"
@@ -625,6 +627,26 @@
           </el-tab-pane>
         </el-tabs>
 
+        <el-tabs
+          v-model="form.ProcessingTab"
+          class="demo-tabs Completioninformation"
+          v-loading="form.Packageloading"
+        >
+          <el-tab-pane label="完结信息" name="0">
+            <div class="el-ckbtn">
+                <el-button type="primary" @click="AddCompensation">添加赔款方</el-button>
+                <el-button type="primary" @click="AddPayee">添加受款方</el-button>
+            </div>
+
+
+
+          </el-tab-pane>
+        </el-tabs>
+
+
+
+
+
         <!-- 照片上传 -->
         <el-tabs
           v-model="form.responsibilities"
@@ -763,6 +785,14 @@ const form = ref({
   deliver: [], //配送车次号
   //   理赔金额
   Claimamount: [],
+  Completion:[{
+    state:0,//赔款方
+    warehouseId:'',//仓库
+    reason:'',//原因
+    money:0,//金额
+    compensationPersonnel:'',//责任人
+    
+  }],//完结循环列表
   fileList: [], //照片
 });
 const myData = ref({}); //用户信息记录
@@ -2069,4 +2099,9 @@ const TabactiveClick = (a, b) => {
   left: 12%;
   top: 10%;
 }
+:deep(.Completioninformation){
+  .is-active{
+    font-weight: bold;
+  }
+}
 </style>
diff --git a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
index 44b4f7c4..a8787953 100644
--- a/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
+++ b/src/views/basicdata/warehouse/tray/basicdataTrayedt.vue
@@ -275,18 +275,18 @@ export default {
             search: true,
             width: '100px',
           },
-          {
-            label: '所在列',
-            prop: 'columnNum',
-            search: true,
-            width: '100px',
-          },
-          {
-            label: '所在行',
-            prop: 'layerNum',
-            search: true,
-            width: '100px',
-          },
+          // {
+          //   label: '所在列',
+          //   prop: 'columnNum',
+          //   search: true,
+          //   width: '100px',
+          // },
+          // {
+          //   label: '所在行',
+          //   prop: 'layerNum',
+          //   search: true,
+          //   width: '100px',
+          // },
           {
             label: '操作时间',
             prop: 'operateTime',
@@ -414,16 +414,16 @@ export default {
             prop: 'positionCode',
             width: '100px',
           },
-          {
-            label: '所在列',
-            prop: 'columnNum',
-            width: '100px',
-          },
-          {
-            label: '所在层',
-            prop: 'layerNum',
-            width: '100px',
-          },
+          // {
+          //   label: '所在列',
+          //   prop: 'columnNum',
+          //   width: '100px',
+          // },
+          // {
+          //   label: '所在层',
+          //   prop: 'layerNum',
+          //   width: '100px',
+          // },
           {
             label: '操作时间',
             prop: 'operateTime',
@@ -496,16 +496,16 @@ export default {
             prop: 'positionCode',
             width: '100px',
           },
-          {
-            label: '所在列',
-            prop: 'columnNum',
-            width: '100px',
-          },
-          {
-            label: '所在层',
-            prop: 'layerNum',
-            width: '100px',
-          },
+          // {
+          //   label: '所在列',
+          //   prop: 'columnNum',
+          //   width: '100px',
+          // },
+          // {
+          //   label: '所在层',
+          //   prop: 'layerNum',
+          //   width: '100px',
+          // },
           {
             label: '操作时间',
             prop: 'operateTime',
@@ -810,28 +810,28 @@ export default {
           sortable: true,
           head: false,
         },
-        {
-          prop: 'columnNum',
-          label: '所在列',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'layerNum',
-          label: '所在层',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
+        // {
+        //   prop: 'columnNum',
+        //   label: '所在列',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
+        // {
+        //   prop: 'layerNum',
+        //   label: '所在层',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
         {
           label: '操作时间',
           prop: 'operateTime',
@@ -932,28 +932,28 @@ export default {
           sortable: true,
           head: false,
         },
-        {
-          prop: 'columnNum',
-          label: '所在列',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'layerNum',
-          label: '所在层',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
+        // {
+        //   prop: 'columnNum',
+        //   label: '所在列',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
+        // {
+        //   prop: 'layerNum',
+        //   label: '所在层',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
         {
           prop: 'num',
           label: '数量',
@@ -1054,28 +1054,28 @@ export default {
           sortable: true,
           head: false,
         },
-        {
-          prop: 'columnNum',
-          label: '所在列',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
-        {
-          prop: 'layerNum',
-          label: '所在行',
-          type: 1,
-          values: '',
-          width: '150',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-          head: false,
-        },
+        // {
+        //   prop: 'columnNum',
+        //   label: '所在列',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
+        // {
+        //   prop: 'layerNum',
+        //   label: '所在行',
+        //   type: 1,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
         {
           label: '操作时间',
           prop: 'operateTime',