签收、待签收详情页重构

src/views/distribution/signfor/distributionSignforedt.vue

@@ -4,7 +4,7 @@
       <div class="card-header">
         <span>当前签收单状态</span>
       </div>
-      <el-steps :active="1" finish-status="success">
+      <el-steps :active="active" finish-status="success">
         <el-step title="待签收" />
         <el-step title="司机签收" />
         <el-step title="文员审核" />
@@ -160,8 +160,46 @@
           />
         </el-tooltip>
       </div>
+      <div class="el-sw">
+        <div class="el-box">
+          <div class='icon-tit'>
+        <el-icon><LocationInformation /></el-icon>
+        <span class="title-name">文员备注:</span>
+          </div>
+        <el-tooltip
+                :content="form.clerkSignRemarks ? form.clerkSignRemarks : '暂无文员备注'"
+                placement="top"
+        >
+          <el-input
+                  class="positioning"
+                  v-model="form.clerkSignRemarks"
+                  disabled
+                  placeholder="文员备注"
+          />
+        </el-tooltip>
+        </div>
+
+        <div class="el-box">
+          <div class='icon-tit'>
+        <el-icon><LocationInformation /></el-icon>
+        <span class="title-name">司机备注:</span>
+          </div>
+        <el-tooltip
+                :content="form.driverRemarks ? form.driverRemarks : '暂无司机备注'"
+                placement="top"
+        >
+          <el-input
+                  class="positioning"
+                  v-model="form.driverRemarks"
+                  disabled
+                  placeholder="司机备注"
+          />
+        </el-tooltip>
+        </div>
+      </div>
     </div>
 
+
     <div class="FImg">
       <div class="imgName">
         <span
@@ -274,7 +312,9 @@
           <img w-full :src="dialogImageUrlE" alt="IMG" />
         </el-dialog>
       </div>
+
     </div>
+
     <!-- 签收信息 -->
 
     <el-collapse v-model="activeNames" style="margin-top: 10px">
@@ -1458,10 +1498,15 @@ getDetail(RouterId.value).then(res => {
   editLoading.value = false; //表格加载结束
   console.log(res, '基础信息');
   // 当前订单状态
-  if (res.data.data.sijiSigningStatus) {
+  if (res.data.data.sijiSigningStatus == '2') {
     active.value = 2; //司机已签收
   }
-  if (res.data.data.sijiSigningStatus && res.data.data.wenyuanSigningStatus) {
+  // if (res.data.data.sijiSigningStatus == && res.data.data.wenyuanSigningStatus) {
+  //   active.value = 3; //文员已签收
+  // }
+
+  // 文员签收单独判断
+  if (res.data.data.wenyuanSigningStatus == '2') {
     active.value = 3; //文员已签收
   }
   form.value = res.data.data; //基础信息
@@ -1754,4 +1799,21 @@ const ImgSuccessE = (response, uploadFile) => {
     align-items: center;
   }
 }
+  .el-sw{
+    width:100%;
+    margin-top: 15px;
+    display: flex;
+    flex-direction: column;
+    min-height: 82px;
+    justify-content: space-between;
+
+  }
+  .icon-tit{
+    display: flex;
+    min-width: 138px;
+    align-items: center;
+  }
+  .el-box{
+    display:flex;
+  }
 </style>