自提管理新增订单自编号字段

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -286,12 +286,12 @@
             </el-tab-pane>
           </el-tabs>
           <!-- 完善信息 -->
-          <div class="Improveinformation">
-
 
+          <div class="Improveinformation">
             <div class="selector">
               <div class="el-form-item selector">
-                <span class="el-form-item__label">处理结果</span>
+                <el-tabs type="border-card" style="width: 100%">
+                  <el-tab-pane label="处理结果">
                     <el-select
                       v-model="endFrom.result"
                       multiple
@@ -309,6 +309,8 @@
                         :value="item.dictKey"
                       />
                     </el-select>
+                  </el-tab-pane>
+                </el-tabs>
               </div>
             </div>
 
@@ -327,30 +329,25 @@
                   <div class="Paymentname" @click="PaymentSelection(item)">
                     {{ item.payment ? item.text : '支付方式' }}
                   </div>
-
+                  <div>
-                  
-                </div>
-              </div>
-
-              <div class="el_tool">
-                <span>总金额:{{ TotalClaimAmount }}</span>
-              </div>
-
-              <el-divider>
-                <span class="ZFname">理赔支付时间</span>
-              </el-divider>
-              <div class="lptime">
-                <!-- <span class="name">理赔支付时间</span> -->
                     <el-date-picker
-                  v-model="endFrom.compensationTime"
+                      v-model="item.compensationTime"
                       type="datetime"
                       format="YYYY-MM-DD"
                       value-format="YYYY-MM-DD HH:mm:ss"
                       :disabled="$route.query.index == '0' || $route.query.index == '2'"
-                  placeholder="请选择运理赔支付时间"
+                      placeholder="支付时间"
+                      :clearable="false"
                     />
                   </div>
                 </div>
+              </div>
+
+              <div class="el_tool">
+                <span>总金额:{{ TotalClaimAmount }}元</span>
+              </div>
+              
+            </div>
             <!-- 处理结果说明  -->
             <el-form-item label="处理结果说明" class="el_resj">
               <el-input
@@ -541,10 +538,8 @@
                 <source :src="videoUrl" type="video/mp4" />
               </video>
             </el-dialog>
-
           </div>
 
-
           <div class="el_sub" v-if="$route.query.index != '0'">
             <el-button type="primary" class="button" @click="submit">提交</el-button>
           </div>
@@ -805,7 +800,7 @@ const msgTop = ref(0); //聊天框吸顶距离
 const scrollContainer = ref(null); //客服实例
 const KFfeel = ref([]); //附件链接
 const MessageResponsibility = ref([]); //消息的处理方选择
-const separateMessageResponsibility=ref([]);//消息的处理方单独选择
+const separateMessageResponsibility = ref([]); //消息的处理方单独选择
 const Msgtextarea = ref(''); //回复框消息
 const msgState = ref(0); //回复消息状态
 const Msgloading = ref(false); //消息回复的加载效果
@@ -853,9 +848,9 @@ const VideoPreviewStatus = ref(false); //视频预览状态
 const warehouseData = ref([]); //处理方
 const MessageContent = ref([]);
 const CompensationParty = ref([
-  { name: '', state: 0, num: null, reason: '', cld: 1,  }, //赔款方
+  { name: '', state: 0, num: null, reason: '', cld: 1 }, //赔款方
   // explains: ''
-  { name: '', state: 1, num: null, reason: '', cld: 1, }, //收款方
+  { name: '', state: 1, num: null, reason: '', cld: 1 }, //收款方
   // explains: ''
 ]); //收/赔
 const ProcessingList = ref([]); //处理结果已经选择的列表
@@ -991,7 +986,6 @@ const onLoad = () => {
     routerState.value = $route.query.RouterState; //当前是新增记录
     console.log(routerState.value, '当前状态');
     $_getInfo({ id: $route.query.id }).then(res => {
-
       console.log(res, '回显返回值参数');
       endFrom.value = res.data.data;
       endFrom.value.result = [];
@@ -1030,7 +1024,7 @@ const onLoad = () => {
         if (item.typesOf == 2) {
           // 处理方
           endFrom.value.processor.push(item.businessId);
-          MessageResponsibility.value.push(item.businessId)
+          MessageResponsibility.value.push(item.businessId);
         }
       });
       console.log(endFrom.value.processor, ' endFrom.value.processor');
@@ -1044,13 +1038,11 @@ const onLoad = () => {
 
       //发现环节回显
       getDictionaryBiz('pc_discovery_node').then(res => {
-
         console.log(res, '发现环节');
         TransportlossList.value = res.data.data;
         console.log(TransportlossList.value, '处理好的发现环节');
       });
 
-
       // 公司占比回显计算
       let sum = 0;
       FangAddList.value.forEach(item => {
@@ -1133,8 +1125,6 @@ const onLoad = () => {
       console.log(res, '处理结果');
       ProcessingResults.value = res.data.data;
     });
-
-
   }
 
   // 异常类型业务字典
@@ -1240,9 +1230,7 @@ onLoad();
 onMounted(() => {
   msgHight.value = window.innerHeight * 0.76;
   console.log(msgHight.value, '处理好的页面高度');
-
   msgTop.value = window.innerHeight * 0.1;
-
   // 滚动到最后
   setTimeout(() => {
     const container = scrollContainer.value;
@@ -1254,10 +1242,17 @@ onMounted(() => {
 const changeProcessingResults = val => {
   // 首先删除取消的项目
   ProcessingList.value = ProcessingList.value.filter(item => val.includes(item.state - 1));
-
   // 然后添加或保持新的项目
   val.forEach(num => {
-    let newItem = { input: 0, min: 0, max: 9999999999999, state: num + 1, payment: '', text: '' };
+    let newItem = {
+      input: 0,
+      min: 0,
+      max: 9999999999999,
+      state: num + 1,
+      payment: '',
+      text: '',
+      compensationTime: '',
+    };
     // 根据num为newItem的name字段赋值
     switch (num) {
       case '1':
@@ -1369,7 +1364,7 @@ const AddCompensation = () => {
       som++;
     }
   });
-  CompensationParty.value.push({ name: '', state: 0, num: 0, reason: '', cld: som,  });
+  CompensationParty.value.push({ name: '', state: 0, num: 0, reason: '', cld: som });
   // explains: ''
 };
 // 添加收款方
@@ -1380,7 +1375,7 @@ const AddPayee = () => {
       som++;
     }
   });
-  CompensationParty.value.push({ name: '', state: 1, num: 0, reason: '', cld: som, });
+  CompensationParty.value.push({ name: '', state: 1, num: 0, reason: '', cld: som });
   // explains: ''
 };
 // 理赔总金额计算
@@ -1720,7 +1715,7 @@ const submit = () => {
               ? paymentMethodMatch.dictValue
               : '未知支付方式',
             resultName: item.name, //处理结果名字
-
+            compensationTime: item.compensationTime, //赔付时间
           };
         } else {
           return null;
@@ -1891,7 +1886,7 @@ const ViewPackageDetails = val => {
   position: relative;
   padding: 26px;
   box-sizing: border-box;
-  margin-top: 20px;
+  margin-top: 46px;
   color: #606266;
   display: flex;
   flex-direction: column;
@@ -1911,10 +1906,9 @@ const ViewPackageDetails = val => {
     justify-content: space-between;
     .name {
       display: flex;
-      margin-right: 5%;
       margin-bottom: 20px;
       height: 30px;
-      width: 45%;
+      width: 46%;
       span {
         display: block;
         width: 30%;
@@ -2005,7 +1999,7 @@ const ViewPackageDetails = val => {
   height: 300px !important;
 }
 .Improveinformation {
-  margin-top: 20px;
+  margin-top: 32px;
   width: 100%;
   :deep(.custom-tabs-label) {
     display: flex;
@@ -2060,7 +2054,8 @@ const ViewPackageDetails = val => {
   font-size: 14px;
   padding: 10px;
   cursor: pointer;
-  width: 100px;
+  width: 190px;
+  margin: 0 4px;
 }
 .Paymentname:hover {
   border: 1px solid #172e60;
@@ -2350,7 +2345,7 @@ const ViewPackageDetails = val => {
     width: 100%;
   }
 }
-.el-endtabs{
+.el-endtabs {
   margin-top: 26px;
 }
 </style>

src/views/distribution/inventory/distrilbutionBillLadingList.vue

@@ -271,6 +271,16 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '130',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
         {
           prop: 'serviceNumber',
           label: '服务号',