Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -319,15 +319,9 @@
     </el-row>
     <!-- 关联订单弹窗 -->
     <el-dialog :title="relationOrderListDialog.title" :visible.sync="relationOrderListDialog.visible" width="30%" append-to-body>
-      <el-tree
-      :data="relationOrderListDialog.data"
-      node-key="id"
-      default-expand-all
-      :expand-on-click-node="false">
-      <span class="custom-tree-node" slot-scope="{ node, data }">
-        <span>{{ data.order.orderNo }}</span>
-      </span>
-    </el-tree>
+      <el-card>
+        <div v-html="relationOrderListDialog.data"></div>
+      </el-card>
       <el-row style="margin-top: 10px;text-align: center;">
         <el-button type="primary" @click="relationOrderListDialog.visible = false">{{$t('关闭窗口')}}</el-button>
       </el-row>
@@ -526,7 +520,7 @@ export default {
       getAllRelateOrderList({orderId:item.orderId,orderNo:item.orderNo}).then(res=>{
         this.relationOrderListDialog.title = item.orderNo+'关联订单'
         this.relationOrderListDialog.visible = true
-        this.relationOrderListDialog.data = [res.data]
+        this.relationOrderListDialog.data = res.msg.replace(/\n/g,'<br>')
       })
       
     },

src/views/ecw/box/shippingSea/nodePage/review.vue

@@ -4,6 +4,7 @@
       <el-form-item :label="$t('申请理由')">
         <el-input v-model="reviewObj.applyReason" type="textarea" rows="2" :placeholder="$t('请输入申请理由')" :disabled="isReview"></el-input>
       </el-form-item>
+      <span v-if="voKey=='preInstallBackInfo'" style="color: red;margin-left: 120px;">{{$t('请注意，预装反审后，全部提单需重新制作')}}</span>
     </el-form>
     <el-row class="operate-button">
       <el-button type="success" @click="onSubmit" v-show="!isReview">{{$t('发起申请')}}</el-button>

src/views/ecw/customer/query.vue

@@ -51,6 +51,7 @@
             </el-descriptions-item>
             <el-descriptions-item :label="$t('备注')">{{ customer.remarks  }}</el-descriptions-item>
             <el-descriptions-item :label="$t('新老客户')">{{ customer.isNew ?$t('新客户') : $t('老客户')  }}</el-descriptions-item>
+            <el-descriptions-item :label="$t('付款人姓名')">{{ customer.payerName  }}</el-descriptions-item>
             <el-descriptions-item v-if="permissions.includes('ecw:customer:query-card')"  :label="$t('身份证姓名')">{{ customer.carName }}</el-descriptions-item>
             <el-descriptions-item v-if="permissions.includes('ecw:customer:query-card')"  :label="$t('身份证号码')">{{ customer.carNo }}</el-descriptions-item>
 <!--            <el-descriptions-item :label="$t('信用等级')">{{ customer }}</el-descriptions-item>-->

src/views/ecw/order/addAssociatedOrder.vue

@@ -42,10 +42,7 @@
          {{parseTime(row.rucangTime)}}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('状态')">
-        <template v-slot:default="scope">
-          <dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS"></dict-tag>
-        </template>
+      <el-table-column :label="$t('状态')" prop="statusMsg">
       </el-table-column>
       <el-table-column :label="$t('操作')">
         <template v-slot:default="scope">

src/views/ecw/order/associatedOrder.vue

@@ -54,7 +54,7 @@
      </el-table-column>
      <el-table-column :label="$t('状态')" prop="status" >
        <template v-slot:default="scope">
-         <dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
+        {{scope.row.orderBackVO.statusMsg}}
        </template>
      </el-table-column>
      <el-table-column :label="$t('操作人')" prop="creator">

src/views/ecw/order/mutexOrder.vue

@@ -54,7 +54,7 @@
       </el-table-column>
       <el-table-column :label="$t('状态')" prop="status" >
         <template v-slot:default="scope">
-          <dict-tag :value="scope.row.orderBackVO.status" :type="DICT_TYPE.ORDER_STATUS" ></dict-tag>
+          {{scope.row.orderBackVO.statusMsg}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('操作人')">

src/views/ecw/order/notMutexOrder.vue

@@ -42,10 +42,7 @@
           {{parseTime(row.rucangTime)}}
         </template>
       </el-table-column>
-      <el-table-column :label="$t('状态')">
-        <template v-slot:default="scope">
-          <dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS"></dict-tag>
-        </template>
+      <el-table-column :label="$t('状态')" prop="statusMsg" >
       </el-table-column>
       <el-table-column :label="$t('操作')">
         <template v-slot:default="scope">