src/views/order/cloth/collectCloth.vue

@@ -165,7 +165,7 @@
             ></el-date-picker>
           </el-form-item> -->
 
-                  <el-form-item label="取衣方式" prop="sendClothWay">
+                  <el-form-item v-if="orderForm.isAppointment == 'Y'" label="取衣方式" prop="sendClothWay">
                     <el-select v-model="orderForm.sendClothWay" placeholder="请选择" clearable>
                       <el-option
                         v-for="dict in dict.type.cloth_send_type"

src/views/order/delivery/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label-width="120px" prop="orgId">
-        <el-select v-model="queryParams.storeId" placeholder="请选择" clearable filterable>
+        <el-select v-if="userInfoVO.userType == '00'" v-model="queryParams.storeId" placeholder="请选择门店" clearable filterable>
           <el-option v-for="store in storeList" :key="store.id + store.sourceType" :label="store.name" :value="store.id"> </el-option>
         </el-select>
       </el-form-item>
@@ -43,7 +43,12 @@
       <el-table-column label="商品订单号" align="center" prop="orderSn" />
       <el-table-column label="配送单号" align="center" prop="deliverySn" />
       <el-table-column label="所属门店" align="center" prop="storeName" />
-      <el-table-column label="订单类型" align="center" prop="clothOrderType" />
+      <el-table-column label="订单类型" align="center" prop="clothOrderType">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.clothOrderType == 0" type="success"> {{ '收衣' }}</el-tag>
+          <el-tag v-if="scope.row.clothOrderType == 1" type="primary"> {{ '取衣' }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="客户名称" align="center" prop="userName" />
       <el-table-column label="地址" align="center" prop="userAddress" />
       <el-table-column label="联系方式" align="center" prop="userPhone" />
@@ -129,10 +134,12 @@ export default {
       rules: {
         dateRange: [{ required: true, message: '时间范围不能为空', trigger: 'blur' }],
       },
-      queryTimeRange: []
+      queryTimeRange: [],
+      userInfoVO: null,
     }
   },
   created() {
+    this.userInfoVO = this.getUserInfo()
     allOrg().then((res) => {
       this.orgList = res.data
       this.orgList.forEach((org) => {