no message

src/views/mallManagement/order/order_detail/index.vue

@@ -408,11 +408,11 @@
 					<el-card class="box-card">
 						<el-tabs v-model="typeIndex">
               <el-tab-pane v-if="orderDetail.orderStatus != 'YFH' && orderDetail.orderStatus != 'OVER'" label="发货数量" name="1"></el-tab-pane>
-              <el-tab-pane v-if="joinCode" label="发货条码" name="2"></el-tab-pane>
+              <el-tab-pane v-if="joinCode == 'CODE'" label="发货条码" name="2"></el-tab-pane>
 						</el-tabs>
 						<br/>
-						<el-button size="small" v-show="typeIndex == 2 && joinCode" type="primary" @click="addCode()">新增</el-button>
-						<el-button size="small" v-show="typeIndex == 1 && joinCode" type="primary" @click="handleDownload('导入条码模板')">导入条码模板下载</el-button>
+						<el-button size="small" v-show="typeIndex == 2 && joinCode == 'CODE'" type="primary" @click="addCode()">新增</el-button>
+						<el-button size="small" v-show="typeIndex == 1 && joinCode == 'CODE'" type="primary" @click="handleDownload('导入条码模板')">导入条码模板下载</el-button>
 						<div class="table">
 							<!-- 发货数量 -->
 							<el-form v-show="typeIndex == 1" ref="formData1" :model="formData1" label-width="0" size="small" label-position="left">
@@ -435,13 +435,13 @@
 										</template>
 									</el-table-column>
 									<el-table-column prop="sendStockNum" align="center" label="发货数量"></el-table-column>
-									<el-table-column v-if="joinCodeText != 'NO'" prop="" align="center" label="发货仓库">
+									<el-table-column v-if="joinCode != 'NO'" prop="" align="center" label="发货仓库">
 										<template slot-scope="scope">
 											{{storageName}}
 										</template>
 									</el-table-column>
-									<el-table-column v-if="joinCodeText != 'NO'" prop="stockOnQty" align="center" label="发货仓库库存" width="100"></el-table-column>
-									<el-table-column v-if="joinCodeText != 'NO'" prop="allStockQty" align="center" label="库存总数量" width="100"></el-table-column>
+									<el-table-column v-if="joinCode != 'NO'" prop="stockOnQty" align="center" label="发货仓库库存" width="100"></el-table-column>
+									<el-table-column v-if="joinCode != 'NO'" prop="allStockQty" align="center" label="库存总数量" width="100"></el-table-column>
 									<el-table-column prop="insideNum" align="center" label="内机数量"></el-table-column>
 									<el-table-column prop="outNum" align="center" label="外机数量"></el-table-column>
 									<el-table-column prop="partNum" align="center" label="配件数量"></el-table-column>
@@ -449,7 +449,7 @@
 									<el-table-column prop="outCodeQty" align="center" label="导入外机条码数量" width="140"></el-table-column>
 									<el-table-column prop="partsCodeQty" align="center" label="导入配件条码数量" width="140"></el-table-column>
 									<el-table-column label="操作" align="center" width="140" fixed="right">
-										<template slot-scope="scope" v-if="joinCode">
+										<template slot-scope="scope" v-if="joinCode == 'CODE'">
 											<el-upload
 											  action='_'
 											  :show-file-list='false'
@@ -708,7 +708,8 @@ export default {
         storageId: [
           {
             validator: (rule, value, callback) => {
-              if (this.curOpenDialogType !== 'send') {
+              let joinCode = JSON.parse(localStorage.getItem('greemall_user')).joinCode;
+              if (this.curOpenDialogType !== 'send' || joinCode == 'NO') {
                 callback()
               } else {
                 if (!value) {
@@ -781,8 +782,7 @@ export default {
 	  },
 	  isEdit1: 0,
 	  isEdit2: 0,
-	  joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode === "CODE",
-	  joinCodeText: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
+	  joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
 	  orderDetailId: '',
 
     printList: [],

src/views/mallManagement/order/order_list/index.vue

@@ -570,33 +570,31 @@
                   <el-form v-show="typeIndex == 3" ref="formData3" :model="formData3" label-width="0" size="small" label-position="left">
 										<el-table :data="formData3.list" element-loading-text="Loading" border fit highlight-current-row stripe>
 											<el-table-column prop="deliveryId" align="center" label="发货单号" width="160"></el-table-column>
-											<el-table-column prop="brandName" align="center" label="品牌"></el-table-column>
-											<el-table-column prop="mainName" align="center" label="大类名称"></el-table-column>
-											<el-table-column prop="smallName" align="center" label="小类名称"></el-table-column>
-											<el-table-column prop="goodsName" align="center" label="商品名称" width="140"></el-table-column>
-											<el-table-column prop="goodsSpecName" align="center" label="规格型号" width="140"></el-table-column>
-											<el-table-column prop="goodsMaterialUnit" align="center" label="单位">
+                      <el-table-column prop="status" align="center" label="状态">
                         <template slot-scope="scope">
-													{{scope.row.goodsMaterialUnit == 'C' ? '整套' : scope.row.goodsMaterialUnit == 'I' ? '单个' : ''}}
-												</template>
+                          {{ {SEND: '已发货', REFUND: '已退货', PART_REFUND: '部分退货', REFUND_PRICE: '仅退款'}[scope.row.status] }}
+                        </template>
                       </el-table-column>
-											<el-table-column prop="sendNum" align="center" label="发货数量"></el-table-column>
-											<el-table-column prop="insideCodeQty" align="center" label="内机数量"></el-table-column>
-											<el-table-column prop="outCodeQty" align="center" label="外机数量"></el-table-column>
-											<el-table-column prop="partsCodeQty" align="center" label="配件数量"></el-table-column>
-											<el-table-column prop="storageStockName" align="center" label="发货仓库" width="100"></el-table-column>
-											<el-table-column prop="pickType" align="center" label="发货方式">
+                      <el-table-column prop="sendNum" align="center" label="发货数量"></el-table-column>
+                      <el-table-column prop="refundNum" align="center" label="退货数量"></el-table-column>
+                      <el-table-column prop="num" align="center" label="订单数量"></el-table-column>
+                      <el-table-column prop="sendInsideCodeQty" align="center" label="内机数量"></el-table-column>
+                      <el-table-column prop="sendOutCodeQty" align="center" label="外机数量"></el-table-column>
+                      <el-table-column prop="sendPartsCodeQty" align="center" label="配件数量"></el-table-column>
+                      <el-table-column prop="storageStockName" align="center" label="发货仓库" width="100"></el-table-column>
+                      <el-table-column prop="pickType" align="center" label="发货方式">
                         <template slot-scope="scope">
-													{{scope.row.pickType == 'YES' ? '自提' : '快递物流'}}
-												</template>
+                          {{scope.row.pickType == 'YES' ? '自提' : '快递物流'}}
+                        </template>
                       </el-table-column>
-											<el-table-column prop="logisticsNo" align="center" label="快递单号" width="100"></el-table-column>
-											<el-table-column prop="companyName" align="center" label="物流公司" width="100"></el-table-column>
-											<el-table-column prop="pickName" align="center" label="提货人"></el-table-column>
-											<el-table-column prop="pickPhone" align="center" label="提货人电话" width="110"></el-table-column>
-											<el-table-column prop="createBy" align="center" label="操作人" width="140"></el-table-column>
-											<el-table-column prop="createTime" align="center" label="操作时间" width="160"></el-table-column>
-                      <el-table-column align="center" label="操作">
+                      <el-table-column prop="logisticsNo" align="center" label="快递单号" width="100"></el-table-column>
+                      <el-table-column prop="companyName" align="center" label="物流公司" width="100"></el-table-column>
+                      <el-table-column prop="pickName" align="center" label="提货人"></el-table-column>
+                      <el-table-column prop="pickPhone" align="center" label="提货人电话" width="110"></el-table-column>
+                      <el-table-column align="center" prop="deliverTime" label="发货时间" min-width="160"></el-table-column>
+                      <el-table-column prop="createBy" align="center" label="操作人" width="140"></el-table-column>
+                      <el-table-column prop="createTime" align="center" label="操作时间" width="160"></el-table-column>
+                      <el-table-column align="center" label="操作" fixed="right">
                         <template slot-scope="scope">
 													<el-button type="text" size="small" @click="returnOrder(scope.row.deliveryId)" v-if="$restrict('returnOrder')">发起退货</el-button>
 												</template>