Merge branch 'master' of http://101.37.21.97:3000/wash/wash_server_v2

admin-ui/src/views/cloth/hanger/upHanger.vue

@@ -13,7 +13,7 @@
                                     <el-input v-model="queryParams.orderNo" placeholder="请输入洗衣单号" clearable @keyup.enter.native="handleQuery" />
                                 </el-form-item>
                                 <el-form-item label="状态" prop="flowStatus">
-                                    <el-radio-group v-model="queryParams.flowStatus">
+                                    <el-radio-group v-model="queryParams.flowStatus" @change="handleQuery">
                                         <el-radio-button label="3">未上挂</el-radio-button>
                                         <el-radio-button label="4">已上挂</el-radio-button>
                                     </el-radio-group>

admin-ui/src/views/order/cloth/collectCloth.vue

@@ -953,6 +953,7 @@ export default {
             })
         },
         onClothItemSelect(index) {
+            this.form.orderClothTypeDTOS = []
             for (let i = 0; i < this.form.clothTypeKeys.length; i++) {
                 var orderClothTypeDTO = { orderClothTypeCode: this.form.clothTypeKeys[i] }
                 if (this.form.clothTypeKeys[i] == '1') {
@@ -1051,6 +1052,7 @@ export default {
             }
         },
         addClothItemConfirm() {
+            console.log(this.addClothActiveTab)
             if (this.addClothActiveTab == 2) {
                 //选择颜色
                 var clothColorDTOS = []

admin-ui/src/views/order/cloth/searchCloth.vue

@@ -45,9 +45,8 @@
         </el-row>
 
         <Page uri="/mapi/order/clothItem/list" :request-params="queryParams" ref="pagination">
-            <el-table-column label="订单编号" align="center" prop="orderNo" min-width="120" fixed="left" />
-            <el-table-column label="衣物条码" align="center" prop="washCode" />
-            <el-table-column label="衣服名称" align="center" prop="clothItemName" />
+            <el-table-column label="衣物条码" align="center" prop="washCode" fixed="left" min-width="120"/>
+            <el-table-column label="衣服名称" align="center" prop="clothItemName"/>
           <el-table-column label="衣物照片" align="center" width="100">
             <template slot-scope="scope">
               <div class="cloth-photos" v-if="scope.row.pics">
@@ -88,6 +87,14 @@
                     </template>
                 </template>
             </el-table-column>
+            <el-table-column label="附件" align="center"  min-width="120">
+                <template slot-scope="scope">
+                    <template v-for="(item, index) in scope.row.orderClothAdjuncts">
+                        {{ index == 0 ? item.adjunctName : ',' + item.adjunctName }}
+                    </template>
+                    <span v-if="!scope.row.orderClothAdjuncts">暂无</span>
+                </template>
+            </el-table-column>
             <el-table-column label="挂衣号" align="center">
                 <template slot-scope="scope">
                     <span v-if="scope.row.clothHanger">
@@ -102,13 +109,14 @@
                     <dict-tag v-else :options="dict.type.order_cloth_flow_status" :value="scope.row.flowStatus" />
                 </template>
             </el-table-column>
+            <el-table-column label="订单编号" align="center" prop="orderNo" min-width="120" />
           <el-table-column label="订单状态" align="center" prop="flowStatus" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.cloth_order_status" :value="scope.row.orderStatus" />
             </template>
           </el-table-column>
-            <el-table-column label="下单时间" align="center" prop="createTime" />
-            <el-table-column label="取衣时间" align="center" prop="sendClothTime">
+            <el-table-column label="下单时间" align="center" prop="createTime"  min-width="90"/>
+            <el-table-column label="取衣时间" align="center" prop="sendClothTime"  min-width="90">
                 <template slot-scope="scope">
                     <span v-if="scope.row.sendClothTime">
                         {{ scope.row.clothHanger.sendClothTime }}

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

@@ -171,16 +171,23 @@
         <el-card>
           <!-- 搜索栏 -->
           <div class="search-bar">
+            <el-radio-group v-model="goodsType"  @change="getCategoryList">
+              <el-radio-button label="0">普通商品</el-radio-button>
+              <el-radio-button label="2">生活服务</el-radio-button>
+              <el-radio-button label="3">汽车美容</el-radio-button>
+            </el-radio-group>
             <el-input
               v-model="searchQuery"
               placeholder="请输入商品条码/名称"
               clearable
               @clear="handleSearchClear"
               @keyup.enter.native="handleSearch"
+              style="flex: 1; margin-left: 10px;"
             >
 
               <el-button slot="append" icon="el-icon-search" @click="handleSearch"></el-button>
             </el-input>
+            
           </div>
 
           <!-- 商品分类标签页 -->
@@ -1415,8 +1422,10 @@ export default {
 
 .right-panel {
   .search-bar {
-    padding: 15px;
+    padding: 15px 0;
     border-bottom: 1px solid #ebeef5;
+    display: flex;
+    align-items: center;
 
     .el-input {
       width: 100%;