拆单线上反馈优化

src/views/ecw/order/splitApply/components/WarehouseRecord.vue

@@ -32,7 +32,7 @@
       <el-table-column :label="$t('体积') + '(m³)'" prop="volume" />
       <el-table-column :label="$t('重量') + '(kg)'" prop="weight" />
       <el-table-column :label="$t('数量（个）')" prop="quantity" />
-      <!--<el-table-column :label="$t('入仓快递单号')" prop="expressNo" />-->
+      <el-table-column :label="$t('入仓快递单号')" prop="expressNo" />
       <!--<el-table-column :label="$t('首次入仓时间')" prop="inTime" >
         <template slot-scope="{row}">{{row.inTime|parseTime}}</template>
       </el-table-column>-->

src/views/ecw/order/splitApply/index.vue

@@ -5,10 +5,6 @@
         <div slot="header" class="card-title">{{$t('拆单申请')}}-{{orderData.orderNo||''}}</div>
         <div class="btn-header">
           <span class="card-title">{{$t('原单信息')}}</span>
-          <div>
-             <span v-if="orderData.abnormalState!=0" class="red">{{$t('异常无法拆单')}}</span>
-             <el-button v-else type="primary" @click="addSplit" :disabled="orderData.inWarehouseState==207">{{$t('新建拆单')}} </el-button>
-          </div>
         </div>
         <el-descriptions :column="4">
             <el-descriptions-item :label="$t('唛头')">
@@ -128,9 +124,16 @@
         </el-table-column>
       </el-table>
     </el-card>
-    <el-card class="card" v-if="splitData.length>0">
+    <el-card class="card">
       <!-- 列表 -->
-      <div slot="header" class="card-title">{{$t('拆单信息')}}</div>
+      <div slot="header" class="card-title flex">
+        <div style="flex: 1; display: flex; align-items: center">{{$t('拆单信息')}}</div>
+        <div>
+          <span v-if="orderData.abnormalState!=0" class="red">{{$t('异常无法拆单')}}</span>
+          <el-button v-else type="primary" @click="addSplit" :disabled="orderData.inWarehouseState==207">{{$t('新建拆单')}} </el-button>
+        </div>
+      </div>
+      <template  v-if="splitData.length>0">
         <div v-for="(item, index) in splitData" :key="index">
           <div class="btn-header">
             <div>
@@ -208,12 +211,14 @@
             </el-table-column>
           </el-table>
         </div>
+      </template>
+      <el-empty v-else></el-empty>
     </el-card>
     <work-flow xmlkey="split_order" v-model="selectedUsers"></work-flow>
     <div slot="footer" class="card footer_btn" v-if="orderData.abnormalState==0">
         <template v-if="orderData.inWarehouseState!=207">
           <el-button type="primary" @click="submitForm">{{$t('提交申请')}}</el-button>
-          <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
+          <el-button plain type="primary" @click="cancel">{{$t('取消')}}</el-button>
           <el-button type="primary" @click="reset">{{$t('重置')}}</el-button>
         </template>
         <template v-else>
@@ -259,7 +264,8 @@
           <el-option v-for="item in orderData.orderItemVOList" :label="item.prodTitleEn" :value="item.orderItemId" :key="item.prodTitleEn" ></el-option>
          </el-select>
       </el-form-item>
-        <div class="page-title">{{$t('品名可拆数据')}}</div>
+       <el-card>
+         <div slot="header" class="page-title">{{$t('品名可拆数据')}}</div>
          <div class="pl-20">
            <span class="mr-10">{{$t('箱数')}}：{{ leftData.num || 0 }}</span>
            <span class="mr-10">{{ $t('入仓方数') }}：{{ leftData.volume || 0 }}m³</span>
@@ -269,7 +275,11 @@
            <span class="mr-10">{{ $t('数量(个)') }}：{{ leftData.quantity || 0 }}</span>
            <span class="mr-10">{{ $t('剩余货值') }}：{{ leftData.worth || 0 }}{{ $t('元') }}</span>
          </div>
-        <div class="page-title">{{$t('可拆入仓记录')}}</div>
+       </el-card>
+
+
+       <el-card class="mt-10">
+         <div slot="header" class="page-title">{{$t('可拆入仓记录')}}</div>
         <el-table
          :data="getOrderItemWarehouseIn(shopForm.orderItemId)"
          style="width: 100%">
@@ -328,7 +338,9 @@
            </template>
          </el-table-column>
         </el-table>
-       <div class="flex-between mt-20 mb-10">
+       </el-card>
+       <el-card class="mt-10">
+         <div slot="header" class="flex-between mt-20 mb-10">
            <div class="page-title" style="margin: 0">
              {{$t('已放入入仓记录')}}
            </div>
@@ -384,8 +396,10 @@
              </template>
            </el-table-column>
          </el-table>
-
-       <div class="page-title">放入数据</div>
+       </el-card>
+       <el-card class="mt-10">
+         <div slot="header" class="page-title">放入数据</div>
+         <div>
            <div class="pl-20 mb-10">
              <span class="mr-10">{{$t('箱数')}}：{{ putin.num || 0 }}，</span>
              <span class="mr-10">{{ $t('数量(个)') }}：{{ putin.quantity || 0 }}，</span>
@@ -407,6 +421,9 @@
            <el-form-item :label="$t('备注信息')">
              <el-input v-model="shopForm.remark"></el-input>
            </el-form-item>
+         </div>
+       </el-card>
+
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="shopAdd" :disabled="!shopForm.specsRecordVOList || !shopForm.specsRecordVOList.length">{{$t('确定')}}</el-button>
@@ -968,10 +985,10 @@ export default {
       })
       that.open = false
     },
-    cancel(){
+    /*cancel(){
       this.open = false
       this.form = {}
-    },
+    },*/
     shopAdd(){
       this.$refs["shopForm"].validate(valid => {
         if (!valid) {
@@ -1146,14 +1163,22 @@ export default {
     },
     // 重置
     reset(){
-      deleteAllSplit(this.queryParams.orderId).then(res => {
+      return deleteAllSplit(this.queryParams.orderId).then(res => {
         this.getList()
       })
+    },
+    // 取消
+    async cancel(){
+      await this.reset()
+      this.$store.dispatch('tagsView/delCurrentView')
     }
   }
 }
 </script>
 <style scoped>
+.page-title{
+  margin: 0;
+}
   .card-title{
       font-size: 18px;
       font-weight: bold;