产品列表 真实销量统计

imcs-bt-be/imcs-business-biz/src/main/resources/mapper_business/base/goods/GoodsMapper.xml

@@ -36,7 +36,7 @@
         id
         ,create_time,create_user,update_time,update_user,
         goods_cate_id, goodsCateName,goods_name, goods_shop_id, goods_status, goods_brand_id, goods_pic, goods_price,goods_weight,
-        goods_tag,goods_unit,goods_sale_type,goods_code,goods_vr_view,goods_rel_view,goodsVrSales,goods_rel_sales,goods_detail_pic
+        goods_tag,goods_unit,goods_sale_type,goods_code,goods_vr_view,goods_rel_view,goodsVrSales,goodsRelsales,goods_detail_pic
     </sql>
 
     <sql id="EquGoods_Column_List">

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

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

imcs-bt-fe/imcs-bt-fe/imcs-ui/src/views/zuihou/goods/goodsManage/Index.vue

@@ -161,9 +161,9 @@
         :label="$t('table.operation')" column-key="operation" align="center" class-name="small-padding fixed-width"
         width="150px">
         <template slot-scope="{ row }">
-          <i @click="specManage(row)" class="el-icon-s-tools table-operation" size="max"
-             :title="$t('bt.operation.specManage')"
-             style="color: #2db7f5;" v-hasPermission="['parameter:add']"/>
+<!--          <i @click="specManage(row)" class="el-icon-s-tools table-operation" size="max"-->
+<!--             :title="$t('bt.operation.specManage')"-->
+<!--             style="color: #2db7f5;" v-hasPermission="['parameter:add']"/>-->
 
           <i @click="flowOfProduction(row)" class="el-icon-s-tools table-operation" size="max"
              :title="$t('bt.operation.flowOfProduction')"

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

@@ -115,16 +115,24 @@
           <span>{{ scope.row.orderUnitPrice }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('btOrder.orderCreateTime')" :show-overflow-tooltip="true" align="center"
+                       prop="orderCreateTime"
+                       width="">
+        <template slot-scope="scope">
+          <span>{{ scope.row.createTime }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('btOrder.orderStatus')" :show-overflow-tooltip="true" align="center"
                        :filter-multiple="false" column-key="goodsCateStatus"
                        :filters="statusFilter"
                        prop="goodsCateStatus" width="80px">
         <template slot-scope="scope">
-          {{ scope.row.orderStatus === 'INIT' ? $t("btOrder.status.dzf") : '' }}
-          {{ scope.row.orderStatus === 'SUCCESS' ? $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") : '' }}
+          {{ 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>
       </el-table-column>
       <el-table-column