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

src/views/ecw/order/associatedOrder.vue

@@ -69,7 +69,7 @@
      </el-table-column>
      <el-table-column label="操作">
        <template v-slot:default='scope'>
-         <el-button type="text"  @click ="guanlianOrderByOrderId(scope.row.orderId)">
+         <el-button type="text"  @click ="guanlianOrderByOrderId(scope.row.relateOrderId)">
            移出
          </el-button>
        </template>

src/views/ecw/order/prepayDeal.vue

@@ -223,13 +223,13 @@
                <el-row>
                 <el-form-item :label="$t('处理结果:')" required v-if="handlerParams.orderExceptionStatus==2">
                   <el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择" clearable>
-                  <el-option  v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
+                  <el-option  v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_don_result')"
                              :key="dict.value" :label="dict.label" :value="dict.value"/>
                   </el-select>
                 </el-form-item>
               </el-row>
-               <el-row>
-                <el-form-item :label="$t('赔付金额:')" size="medium" required v-if="handlerParams.orderExceptionStatus==2">
+               <el-row >
+                <el-form-item :label="$t('赔付金额:')" size="medium" required v-if="handlerParams.orderExceptionStatus==2&&handlerParams.orderExceptionHandlerResult=='confirm_loss'">
                   <el-input style="width: 100px;"  type="text" v-model="handlerParams.amount"  />
                   <el-select v-model="handlerParams.currency" style="width: 100px;margin-left: 10px;" clearable>
                   <el-option  v-for="dict in getDictDatas('shipping_price_unit') "

src/views/ecw/order/splitApply.vue

@@ -157,7 +157,7 @@
           </el-table-column>
           <el-table-column :label="$t('重量')" align="center">
             <template slot-scope="scope">
-                   <span>{{scope.row.weight}}m³</span>
+                   <span>{{scope.row.weight}}kg</span>
                 </template>
             </el-table-column>
           <el-table-column :label="$t('箱数')" align="center">

src/views/ecw/productPrice/index.vue

@@ -336,9 +336,21 @@ export default {
     // 根据状态获取状态名称 ，这个应该可以改成字典,目前接口缺少相关数据，待定
     statusName() {
       return row => {
-        if(row.blacklist) return '黑名单';
-        if(row.auditStatus === AuditStatusEnum.PASS) return '已审核';
-        return '已下架';
+        //判断价格是否过期
+        let validateStartDate = row.validateStartDate;
+        let validateEndDate = row.validateEndDate;
+        let notSetPrice = false;
+        let nowDate = new Date().getTime();
+        if(validateStartDate && validateStartDate > nowDate) {
+          notSetPrice = true;
+        }
+        if(validateEndDate && validateEndDate < nowDate) {
+          notSetPrice = true;
+        }
+        let setPriceText = notSetPrice ? '(未设置价格)' : '';
+        if(row.blacklist) return '黑名单' + setPriceText;
+        if(row.auditStatus === AuditStatusEnum.PASS) return '已审核' + setPriceText;
+        return '已下架' + setPriceText;
       }
     },