浏览代码

解决前端页面展现bug

oyq28 3 年之前
父节点
当前提交
0ab5fb7b5c

+ 5 - 8
imcs-bt-fe/imcs-bt-fe/imcs-ui/src/lang/zh/btOrder.js

@@ -28,14 +28,11 @@ export default {
     detail: '订单详情',
 
     status: {
-      wzf: '未支付',
-      yzf: '已支付',
-      yqx: '已取消',
-      scwc: '生产完成',
-      yc: '异常',
-      zrtk: '转入退款'
-
-
+      dzf: '待支付',
+      dsc: '待生产',
+      dq: '待取',
+      ywc: '已完成',
+      yqx: '已取消',      
     }
   }
 }

+ 1 - 1
imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/company/Index.vue

@@ -10,7 +10,7 @@
         </span>
       <span>
           {{ $t("bt.searchForm.companyType") }}:
-          <el-select v-model="queryParams.model.comType" placeholder="请选择">
+          <el-select v-model="queryParams.model.comBodyType" placeholder="请选择">
             <el-option
               v-for="item in typeOptions"
               :key="item.value"

+ 7 - 8
imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/order/allOrders.vue

@@ -31,7 +31,7 @@
         </span>
         <span>
           {{ $t("btOrder.orderStatus") }}:
-          <el-select v-model="queryParams.orderStatus">
+          <el-select v-model="queryParams.model.orderStatus">
             <el-option
               v-for="item in statusOptions"
               :key="item.value"
@@ -125,13 +125,12 @@
       <el-table-column :label="$t('btOrder.orderStatus')" :show-overflow-tooltip="true" align="center"
 
                        prop="goodsCateStatus" width="80px">
-        <template slot-scope="scope">
-          {{ scope.row.orderStatus === '0' ? $t("btOrder.status.wzf") : '' }}
-          {{ scope.row.orderStatus === '1' ? $t("btOrder.status.yzf") : '' }}
-          {{ scope.row.orderStatus === '2' ? $t("btOrder.status.yqx") : '' }}
-          {{ scope.row.orderStatus === '3' ? $t("btOrder.status.scwc") : '' }}
-          {{ scope.row.orderStatus === '4' ? $t("btOrder.status.yc") : '' }}
-          {{ scope.row.orderStatus === '5' ? $t("btOrder.status.zrtk") : '' }}
+        <template slot-scope="scope">          
+          {{ scope.row.orderStatus === '1' ? $t("btOrder.status.dzf") : '' }}
+          {{ scope.row.orderStatus === '2' ? $t("btOrder.status.dsc") : '' }}
+          {{ scope.row.orderStatus === '3' ? $t("btOrder.status.dq") : '' }}
+          {{ scope.row.orderStatus === '4' ? $t("btOrder.status.ywc") : '' }}
+          {{ scope.row.orderStatus === '5' ? $t("btOrder.status.yqx") : '' }}
         </template>
       </el-table-column>
       <el-table-column