Merge remote-tracking branch 'origin/master'

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

@@ -257,7 +257,6 @@
                         <el-input v-model="defaultList.item" placeholder="请输入要搜索的衣服类型" style="width: 300px" clearable>
                             <el-button slot="append" icon="el-icon-search" @click="searchCloth('item', 'clothItems')"></el-button>
                         </el-input>
-                        <el-button type="primary" @click="changeClothActiveTab(0)" style="margin-left: 10px">上一步</el-button>
                     </div>
                     <div style="margin-left: 40px">
                         <div class="horizontal-view" style="margin-left: 15px">
@@ -277,7 +276,6 @@
                         <el-input v-model="defaultList.color" placeholder="请输入要搜索的衣服颜色" style="width: 300px" clearable>
                             <el-button slot="append" icon="el-icon-search" @click="searchCloth('color', 'clothColors')"></el-button>
                         </el-input>
-                        <el-button type="primary" @click="changeClothActiveTab(1)" style="margin-left: 10px" v-if="!isUpdateClothItem">上一步</el-button>
                     </div>
                     <div style="margin-left: 40px; display: flex; flex-wrap: wrap">
                         <template v-for="(item, index) in clothColors">
@@ -298,7 +296,6 @@
                         <el-input v-model="defaultList.brand" placeholder="请输入要搜索的衣服品牌" style="width: 300px" clearable>
                             <el-button slot="append" icon="el-icon-search" @click="searchCloth('brand', 'clothBrands')"></el-button>
                         </el-input>
-                        <el-button type="primary" @click="changeClothActiveTab(2)" style="margin-left: 10px" v-if="!isUpdateClothItem">上一步</el-button>
                     </div>
                     <div style="margin-left: 40px">
                         <el-tag :key="item.id" type="info" v-for="item in clothBrands" style="margin-top: 15px; margin-left: 15px" size="medium" @click="onClothBrandSelect(item.id)">
@@ -313,7 +310,6 @@
                                 <el-input v-model="defaultList.flaw" placeholder="请输入要搜索的衣服瑕疵" style="width: 300px" clearable>
                                     <el-button slot="append" icon="el-icon-search" @click="searchCloth('flaw', 'clothFlaws')"></el-button>
                                 </el-input>
-                                <el-button type="primary" @click="changeClothActiveTab(3)" style="margin-left: 10px" v-if="!isUpdateClothItem">上一步</el-button>
                             </div>
                             <el-tag :key="item.id" :type="item.isSelect ? 'success' : 'info'" v-for="(item, index) in clothFlaws" style="margin-top: 15px; margin-left: 15px" size="medium" @click="onClothFlawSelect(index)">
                                 {{ item.name }}
@@ -338,10 +334,9 @@
                         <el-col :span="8">
                             <div>选择附件</div>
                             <div style="margin-left: 15px; margin-top: 10px">
-                                <el-input v-model="defaultList.adjunct" placeholder="请输入要搜索的衣服附件" style="width: 200px" clearable>
+                                <el-input v-model="defaultList.adjunct" placeholder="请输入要搜索的衣服附件" clearable>
                                     <el-button slot="append" icon="el-icon-search" @click="searchCloth('adjunct', 'clothAdjuncts')"></el-button>
                                 </el-input>
-                                <el-button type="primary" @click="changeClothActiveTab(4)" style="margin-left: 10px" v-if="!isUpdateClothItem">上一步</el-button>
                             </div>
                             <el-tag :key="item.id" type="info" v-for="item in clothAdjuncts" style="margin-top: 15px; margin-left: 15px" @click="onClothAdjunctSelect(item)">
                                 {{ item.name }}
@@ -365,8 +360,13 @@
                     </el-row>
                 </el-col>
             </el-row>
-            <div slot="footer" class="dialog-footer" v-if="addClothActiveTab == 2 || addClothActiveTab == 4 || addClothActiveTab == 5">
-                <el-button type="primary" @click="addClothItemConfirm" style="margin-left: 5%">确定</el-button>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="changeClothActiveTab(0)" v-if="addClothActiveTab == 1">上一步</el-button>
+                <el-button type="primary" @click="changeClothActiveTab(1)" v-if="!isUpdateClothItem && addClothActiveTab == 2">上一步</el-button>
+                <el-button type="primary" @click="changeClothActiveTab(2)" v-if="!isUpdateClothItem && addClothActiveTab == 3">上一步</el-button>
+                <el-button type="primary" @click="changeClothActiveTab(3)" v-if="!isUpdateClothItem && addClothActiveTab == 4">上一步</el-button>
+                <el-button type="primary" @click="changeClothActiveTab(4)" v-if="!isUpdateClothItem && addClothActiveTab == 5">上一步</el-button>
+                <el-button type="primary" @click="addClothItemConfirm" v-if="addClothActiveTab == 2 || addClothActiveTab == 4 || addClothActiveTab == 5">确定</el-button>
             </div>
         </el-dialog>