fixbug

admin-ui/.env.development

@@ -5,10 +5,10 @@ VUE_APP_TITLE = 一七管理系统
 ENV = 'development'
 
 
-VUE_APP_BASE_API_HOST = 'http://192.168.5.176:9801'
-VUE_APP_BASE_API = 'http://192.168.5.176:9801'
-#VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
-#VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
+# VUE_APP_BASE_API_HOST = 'http://192.168.5.176:9801'
+# VUE_APP_BASE_API = 'http://192.168.5.176:9801'
+VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
+VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
 # VUE_APP_BASE_API_HOST = 'http://192.168.5.247:9801/'
 # VUE_APP_BASE_API = 'http://192.168.5.247:9801/'
 

admin-ui/src/views/order/delivery/index.vue

@@ -15,14 +15,14 @@
       <el-form-item>
         <el-select v-model="queryParams.clothOrderType" placeholder="请选择订单类型" clearable filterable>
           <el-option label="收衣" :value="0" />
-          <el-option label="取衣" :value="1" />
+          <el-option label="送衣" :value="1" />
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <!-- <el-form-item>
         <el-select v-model="queryParams.deliveryStatus" placeholder="请选择订单状态" clearable filterable>
           <el-option v-for="dict in dict.type.delivery_status" :key="dict.code" :label="dict.label" :value="dict.value" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-date-picker style="width: 250px" clearable v-model="queryTimeRange" type="daterange"
                         value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期"
@@ -52,7 +52,7 @@
       <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>
+          <el-tag v-if="scope.row.clothOrderType == 1" type="primary"> {{ '送衣' }}</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="客户名称" align="center" prop="userName" />

admin-ui/src/views/workbench/workAppointmentOrder/index.vue

@@ -34,7 +34,7 @@
       <el-tab-pane label="清洗中" :name="'6'"></el-tab-pane>
       <el-tab-pane label="待上挂" :name="'8'"></el-tab-pane>
       <el-tab-pane label="待送衣" :name="'9'"></el-tab-pane>
-      <el-tab-pane label="送衣中" :name="'10'"></el-tab-pane>
+      <!-- <el-tab-pane label="送衣中" :name="'10'"></el-tab-pane> -->
       <el-tab-pane label="已完成" :name="'12'"></el-tab-pane>
 
       <el-table v-loading="loading" fit highlight-current-row border stripe :data="clothList">