优化门店管理页面，去除订单衣服明细里面相关的费率配置

admin-ui/src/views/systemSet/purchaseGoods/index.vue

@@ -26,7 +26,7 @@
             <!--      <el-table-column type="selection" width="55" align="center" fixed="left"/>-->
             <el-table-column label="订单编号" align="center" prop="orderNo" width="200px" />
             <el-table-column label="进货总价（元）" align="center" prop="costTotalPrice" width="150px" />
-            
+
             <el-table-column label="下单方式" align="center" prop="payType" width="150px">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.recharge_pay_type" :value="scope.row.payType" />
@@ -65,14 +65,14 @@
                     <el-col :span="4" class="category-section">
                         <div class="section-title">{{ titleType }}</div>
                         <div class="category-tree">
-                            <el-tree 
-                                :data="categoryList" 
-                                :props="defaultProps" 
-                                :expand-on-click-node="false" 
-                                node-key="id" 
-                                default-expand-all 
-                                highlight-current 
-                                @node-click="handleNodeClick" 
+                            <el-tree
+                                :data="categoryList"
+                                :props="defaultProps"
+                                :expand-on-click-node="false"
+                                node-key="id"
+                                default-expand-all
+                                highlight-current
+                                @node-click="handleNodeClick"
                             />
                         </div>
                     </el-col>
@@ -92,15 +92,15 @@
                                 </el-table-column>
                                 <el-table-column label="数量" align="center" width="120">
                                     <template slot-scope="scope">
-                                        <el-input 
-                                            v-if="scope.row.goodsSkuStoreId == vo.goodsSkuStoreId" 
-                                            v-for="vo in purchaseCountVOList" 
-                                            :key="vo.goodsSkuStoreId" 
-                                            v-model="vo.count" 
-                                            :step="1" 
-                                            :min="1" 
-                                            :max="getMaxCount(scope.row)" 
-                                            @change="countPrice" 
+                                        <el-input
+                                            v-if="scope.row.goodsSkuStoreId == vo.goodsSkuStoreId"
+                                            v-for="vo in purchaseCountVOList"
+                                            :key="vo.goodsSkuStoreId"
+                                            v-model="vo.count"
+                                            :step="1"
+                                            :min="1"
+                                            :max="getMaxCount(scope.row)"
+                                            @change="countPrice"
                                         />
                                     </template>
                                 </el-table-column>
@@ -118,11 +118,11 @@
                             <div class="section-title">商品列表</div>
                             <el-form :inline="true" :model="goodsQueryParams" class="search-form">
                                 <el-form-item label="搜索商品">
-                                    <el-input 
-                                        v-model="goodsQueryParams.keywords" 
-                                        placeholder="请输入商品名称或条码" 
-                                        clearable 
-                                        @keyup.enter.native="getGoodsList" 
+                                    <el-input
+                                        v-model="goodsQueryParams.keywords"
+                                        placeholder="请输入商品名称或条码"
+                                        clearable
+                                        @keyup.enter.native="getGoodsList"
                                     />
                                 </el-form-item>
                                 <el-form-item>
@@ -130,11 +130,11 @@
                                     <el-button @click="resetGoodsQuery">重置</el-button>
                                 </el-form-item>
                             </el-form>
-                            <el-table 
-                                v-loading="loading" 
-                                :data="goodsList" 
-                                border 
-                                stripe 
+                            <el-table
+                                v-loading="loading"
+                                :data="goodsList"
+                                border
+                                stripe
                                 highlight-current-row
                             >
                                 <!-- <el-table-column label="编号" align="center" prop="goodsSkuStoreId" width="100" /> -->
@@ -153,9 +153,9 @@
                                 </el-table-column>
                                 <el-table-column label="操作" align="center" width="100" fixed="right">
                                     <template slot-scope="scope">
-                                        <el-button 
-                                            type="text" 
-                                            icon="el-icon-plus" 
+                                        <el-button
+                                            type="text"
+                                            icon="el-icon-plus"
                                             @click="addGoods(scope.row)"
                                         >
                                             添加
@@ -163,12 +163,12 @@
                                     </template>
                                 </el-table-column>
                             </el-table>
-                            <pagination 
-                                v-show="goodsTotal > 0" 
-                                :total="goodsTotal" 
-                                :page.sync="goodsQueryParams.pageNum" 
-                                :limit.sync="goodsQueryParams.pageSize" 
-                                @pagination="getGoodsList" 
+                            <pagination
+                                v-show="goodsTotal > 0"
+                                :total="goodsTotal"
+                                :page.sync="goodsQueryParams.pageNum"
+                                :limit.sync="goodsQueryParams.pageSize"
+                                @pagination="getGoodsList"
                             />
                         </div>
                     </el-col>
@@ -200,10 +200,10 @@
                         </el-form>
                     </el-col>
                     <el-col :span="4">
-                        <el-button 
-                            type="primary" 
-                            icon="el-icon-shopping-cart-2" 
-                            size="small" 
+                        <el-button
+                            type="primary"
+                            icon="el-icon-shopping-cart-2"
+                            size="small"
                             @click="submitForm"
                         >
                             提交
@@ -234,7 +234,6 @@
             </el-card>
             <div class="head-column2">
                 <el-table v-loading="loading" fit highlight-current-row border stripe :data="detailList">
-                    <el-table-column label="分类" align="center" prop="goodsCategoryName" />
                     <el-table-column :label="goodsType == 0 ? '商品名称' : '材料名称'" align="center" prop="goodsName" width="250px" />
                     <el-table-column :label="goodsType == 0 ? '商品规格' : '材料规格'" align="center" width="250px">
                         <template slot-scope="scope">
@@ -438,7 +437,7 @@ export default {
                         return;
                     }
                 }
-                
+
                 // 不在已添加集合中，直接加入集合中
                 this.addGoodsList.push(row);
                 this.purchaseCountVOList.push({
@@ -458,7 +457,7 @@ export default {
                         return;
                     }
                 }
-                
+
                 this.addGoodsList.push(row);
                 this.purchaseCountVOList.push({
                     'goodsSkuStoreId': row.goodsSkuStoreId,
@@ -659,7 +658,7 @@ export default {
   .category-section {
     border-right: 1px solid #EBEEF5;
     height: 100%;
-    
+
     .section-title {
       font-size: 16px;
       font-weight: bold;
@@ -718,7 +717,7 @@ export default {
       color: #606266;
       font-weight: 500;
     }
-    
+
     td {
       padding: 8px 0;
     }
@@ -726,15 +725,15 @@ export default {
 
   .el-button--text {
     padding: 0 5px;
-    
+
     &:hover {
       color: #409EFF;
     }
-    
+
     &.is-disabled {
       color: #c0c4cc;
       cursor: not-allowed;
-      
+
       &:hover {
         color: #c0c4cc;
       }

admin-ui/src/views/systemSet/store/index.vue

@@ -1,179 +1,214 @@
 <template>
   <div class="app-container">
-    <el-tabs v-model="storeTab" @tab-click="onChangeStoreTab">
-      <el-tab-pane label="基本信息" name="1"></el-tab-pane>
-      <el-tab-pane label="结算账号" name="2"></el-tab-pane>
-    </el-tabs>
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <el-tabs v-model="storeTab" @tab-click="onChangeStoreTab" class="store-tabs">
+          <el-tab-pane label="基本信息" name="1"></el-tab-pane>
+          <el-tab-pane label="结算账号" name="2"></el-tab-pane>
+        </el-tabs>
+      </div>
 
-    <el-row :gutter="20">
-      <el-form v-loading="loading" ref="elForm" :model="form" :rules="rules" style="margin-left: 20%" :style="{width: '60%'}">
-        <!-- 基本信息 -->
-        <template v-if="storeTab == '1'">
-          <template v-if="storeTab1actionPage == '1'">
-            <el-descriptions title="门店信息" :column="2" border :contentStyle="{'text-align': 'center'}">
-              <!-- 详情展示  ==============================================        -->
-              <template slot="extra">
-                <el-button type="primary" size="medium" @click="handelActionStoreTab1" v-hasPermi="['system:store:edit']">操作</el-button>
-              </template>
-              <el-descriptions-item>
-                <template slot="label"><i class="el-icon-discount"></i>门店编号</template>
-                {{form.code}}</el-descriptions-item>
-              <el-descriptions-item :labelStyle="{width: '25%'}">
-                <template slot="label"><i class="el-icon-office-building"></i>门店名称</template>
-                {{form.name}}</el-descriptions-item>
-              <el-descriptions-item span="2" :contentStyle="{'text-align': 'left'}">
-                <template slot="label"><i class="el-icon-picture"></i>门店免洗额度</template>
-                {{form.balance}}
-              </el-descriptions-item>
-              <el-descriptions-item span="2" :contentStyle="{'text-align': 'left'}">
-                <template slot="label"><i class="el-icon-picture"></i>门店照片</template>
-                <el-image style="width: 100px; height: 100px" :src="form.companyPic" fit="fill"></el-image>
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label"><i class="el-icon-connection"></i>授权日期</template>
-                {{form.openDateParse}}</el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label"><i class="el-icon-time"></i>营业时间</template>
-                {{form.businessStartTime}} - {{form.businessEndTime}}</el-descriptions-item>
-              <el-descriptions-item label="门店状态">
-                <template slot="label"><i class="el-icon-s-flag"></i>门店状态</template>
-                <el-tag size="small" v-if="form.status==item.value" v-for="item in options" :key="item.value">
-                  {{item.label}}</el-tag>
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label"><i class="el-icon-phone"></i>服务热线</template>
-                {{form.contactWorkTel}}</el-descriptions-item>
+      <el-row :gutter="20">
+        <el-form v-loading="loading" ref="elForm" :model="form" :rules="rules" class="store-form">
+          <!-- 基本信息 -->
+          <template v-if="storeTab == '1'">
+            <template v-if="storeTab1actionPage == '1'">
+              <el-descriptions title="门店信息" :column="2" border class="store-descriptions">
+                <template slot="extra">
+                  <el-button type="primary" size="medium" @click="handelActionStoreTab1" v-hasPermi="['system:store:edit']">
+                    <i class="el-icon-edit"></i> 编辑
+                  </el-button>
+                </template>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-discount"></i>门店编号</template>
+                  <span class="description-content">{{form.code}}</span>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-office-building"></i>门店名称</template>
+                  <span class="description-content">{{form.name}}</span>
+                </el-descriptions-item>
+                <el-descriptions-item span="2">
+                  <template slot="label"><i class="el-icon-money"></i>门店免洗额度</template>
+                  <span class="description-content">{{form.balance}}</span>
+                </el-descriptions-item>
+                <el-descriptions-item span="2">
+                  <template slot="label"><i class="el-icon-picture"></i>门店照片</template>
+                  <el-image class="store-image" :src="form.companyPic" fit="cover"></el-image>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-connection"></i>授权日期</template>
+                  <span class="description-content">{{form.openDateParse}}</span>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-time"></i>营业时间</template>
+                  <span class="description-content">{{form.businessStartTime}} - {{form.businessEndTime}}</span>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-s-flag"></i>门店状态</template>
+                  <el-tag :type="form.status === '0' ? 'success' : 'danger'" size="small">
+                    {{form.status === '0' ? '正常' : '禁用'}}
+                  </el-tag>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-phone"></i>服务热线</template>
+                  <span class="description-content">{{form.contactWorkTel}}</span>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-printer"></i>是否打印小票</template>
+                  <el-tag :type="form.isPrint === '0' ? 'success' : 'info'" size="small">
+                    {{form.isPrint === '0' ? '是' : '否'}}
+                  </el-tag>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-user"></i>小票是否打印客户姓名</template>
+                  <el-tag :type="form.isPrintName === '0' ? 'success' : 'info'" size="small">
+                    {{form.isPrintName === '0' ? '是' : '否'}}
+                  </el-tag>
+                </el-descriptions-item>
+                <el-descriptions-item span="2">
+                  <template slot="label"><i class="el-icon-s-comment"></i>店铺说明</template>
+                  <span class="description-content">{{form.companyDetail}}</span>
+                </el-descriptions-item>
+                <el-descriptions-item span="2">
+                  <template slot="label"><i class="el-icon-location-information"></i>详细地址</template>
+                  <span class="description-content">{{form.address}}</span>
+                </el-descriptions-item>
+              </el-descriptions>
+            </template>
 
-              <el-descriptions-item span="1">
-                <template slot="label"><i class="el-icon-download"></i>是否打印小票</template>
-                <el-tag size="small" v-if="form.isPrint==item.value" v-for="item in options" :key="item.value">
-                  {{item.label}}</el-tag>
-              </el-descriptions-item>
+            <!-- 详情编辑 -->
+            <template v-if="storeTab1actionPage == '0'">
+              <el-descriptions title="门店信息" :column="2" border class="store-descriptions">
+                <template slot="extra">
+                  <el-button @click="cancelForm">取消</el-button>
+                  <el-button type="primary" @click="submitForm">保存</el-button>
+                </template>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-discount"></i>门店编号</template>
+                  <span class="description-content">{{form.code}}</span>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-office-building"></i>门店名称</template>
+                  <span class="description-content">{{form.name}}</span>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-connection"></i>授权日期</template>
+                  <span class="description-content">{{form.openDateParse}}</span>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-s-flag"></i>门店状态</template>
+                  <el-tag :type="form.status === '0' ? 'success' : 'danger'" size="small">
+                    {{form.status === '0' ? '正常' : '禁用'}}
+                  </el-tag>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-position"></i>所在区域</template>
+                  <span class="description-content">{{form.provinceName}}{{form.cityName}}{{form.areaName}}</span>
+                </el-descriptions-item>
+              </el-descriptions>
 
-              <el-descriptions-item span="1">
-                <template slot="label"><i class="el-icon-download"></i>小票是否打印客户姓名</template>
-                <el-tag size="small" v-if="form.isPrintName==item.value" v-for="item in options" :key="item.value">
-                  {{item.label}}</el-tag>
-              </el-descriptions-item>
-              <el-descriptions-item span="2">
-                <template slot="label"><i class="el-icon-s-comment"></i>店铺说明</template>
-                {{form.companyDetail}}</el-descriptions-item>
-              <el-descriptions-item span="2">
-                <template slot="label"><i class="el-icon-location-information"></i>详细地址</template>
-                {{form.address}}</el-descriptions-item>
-            </el-descriptions>
+              <div class="edit-form">
+                <el-row :gutter="20">
+                  <el-col :span="24">
+                    <el-form-item label="详细地址" prop="address">
+                      <el-input v-model="form.address" placeholder="请输入详细地址" maxlength="200" show-word-limit />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24">
+                    <el-form-item label="店铺说明" prop="companyDetail">
+                      <el-input type="textarea" v-model="form.companyDetail" placeholder="请输入店铺说明" maxlength="500" show-word-limit />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="服务热线" prop="contactWorkTel">
+                      <el-input v-model="form.contactWorkTel" placeholder="请输入服务热线" maxlength="12" show-word-limit />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="是否打印小票" prop="isPrint">
+                      <el-select v-model="form.isPrint" placeholder="请选择" class="full-width">
+                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-form-item label="小票是否打印客户姓名" prop="isPrintName">
+                      <el-select v-model="form.isPrintName" placeholder="请选择" class="full-width">
+                        <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24">
+                    <el-form-item label="门店照片" prop="companyPic">
+                      <image-upload v-model="form.companyPic" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24">
+                    <el-form-item label="营业时间">
+                      <el-time-picker is-range v-model="businessTimeList" format="HH:mm" value-format="HH:mm" range-separator="至"
+                        start-placeholder="开始时间" end-placeholder="结束时间" placeholder="选择时间范围" class="full-width">
+                      </el-time-picker>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </div>
+            </template>
           </template>
 
-          <!-- 详情编辑  ==============================================        -->
-          <template v-if="storeTab1actionPage == '0'">
-            <el-descriptions title="门店信息" :column="2" border>
-              <template slot="extra">
-                <el-button type="primary" size="medium" @click="cancelForm">取消</el-button>
-                <el-button type="primary" size="medium" @click="submitForm">保存</el-button>
+          <!-- 账号信息 -->
+          <template v-if="storeTab == '2'">
+            <el-descriptions title="账号信息" :column="1" border class="store-descriptions">
+              <template slot="extra" v-if="storeTab2actionPage == '1'">
+                <el-button type="primary" size="medium" @click="handelActionStoreTab2" v-hasPermi="['system:store:edit']">
+                  <i class="el-icon-edit"></i> 编辑
+                </el-button>
+              </template>
+              <template slot="extra" v-if="storeTab2actionPage == '0'">
+                <el-button @click="cancelForm">取消</el-button>
+                <el-button type="primary" @click="submitForm">保存</el-button>
+              </template>
+              <template v-if="storeTab2actionPage == '1'">
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-bank-card"></i>开户行</template>
+                  <span class="description-content">{{form.bankName}}</span>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-user"></i>姓名</template>
+                  <span class="description-content">{{form.bankUserName}}</span>
+                </el-descriptions-item>
+                <el-descriptions-item>
+                  <template slot="label"><i class="el-icon-credit-card"></i>银行卡号</template>
+                  <span class="description-content">{{form.bankCardNumber}}</span>
+                </el-descriptions-item>
               </template>
-              <el-descriptions-item>
-                <template slot="label"><i class="el-icon-discount"></i>门店编号</template>
-                {{form.code}}</el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label"><i class="el-icon-office-building"></i>门店名称</template>
-                {{form.name}}</el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label"><i class="el-icon-connection"></i>授权日期</template>
-                {{form.openDateParse}}</el-descriptions-item>
-              <el-descriptions-item label="门店状态">
-                <template slot="label"><i class="el-icon-s-flag"></i>门店状态</template>
-                <el-tag size="small" v-if="form.status==item.value" v-for="item in options" :key="item.value">
-                  {{item.label}}</el-tag>
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template slot="label"><i class="el-icon-position"></i>所在区域</template>
-                {{form.provinceName}}{{form.cityName}}{{form.areaName}}</el-descriptions-item>
             </el-descriptions>
-
-            <!--  可编辑部分-->
-            <div class="action1">
-
-              <el-col :span="24">
-                <el-form-item label="详细地址" prop="address">
-                  <el-input v-model="form.address" placeholder="请输入详细地址" maxlength="200" show-word-limit />
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="店铺说明" prop="companyDetail">
-                  <el-input v-model="form.companyDetail" placeholder="请输入店铺说明" maxlength="500" show-word-limit />
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="12">
-                <el-form-item label="服务热线" prop="contactWorkTel">
-                  <el-input v-model="form.contactWorkTel" placeholder="请输入服务热线" maxlength="12" show-word-limit />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="是否打印小票" prop="isPrint">
-                  <el-select v-model="form.isPrint" placeholder="请输入" show-word-limit>
-                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="小票是否打印客户姓名" prop="isPrint">
-                  <el-select v-model="form.isPrintName" placeholder="请输入" show-word-limit>
-                    <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="门店照片" prop="companyPic">
-                  <image-upload v-model="form.companyPic" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="营业时间">
-                  <template>
-                    <el-time-picker is-range v-model="businessTimeList" format="HH:mm" value-format="HH:mm" range-separator="至"
-                      start-placeholder="开始时间" end-placeholder="结束时间" placeholder="选择时间范围">
-                    </el-time-picker>
-                  </template>
-                </el-form-item>
-              </el-col>
-            </div>
-          </template>
-
-        </template>
-
-        <!--    账号信息  -->
-        <template v-if="storeTab == '2'">
-          <el-descriptions title="账号信息" :column="1" border>
-            <template slot="extra" v-if="storeTab2actionPage == '1'">
-              <el-button type="primary" size="medium" @click="handelActionStoreTab2" v-hasPermi="['system:store:edit']">操作</el-button>
-            </template>
-            <template slot="extra" v-if="storeTab2actionPage == '0'">
-              <el-button type="primary" size="medium" @click="cancelForm">取消</el-button>
-              <el-button type="primary" size="medium" @click="submitForm">保存</el-button>
+            <template v-if="storeTab2actionPage == '0'">
+              <div class="edit-form">
+                <el-row :gutter="20">
+                  <el-col :span="24">
+                    <el-form-item label="开户行" prop="bankName">
+                      <el-input v-model="form.bankName" placeholder="请输入开户行" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24">
+                    <el-form-item label="姓名" prop="bankUserName">
+                      <el-input v-model="form.bankUserName" placeholder="请输入姓名" />
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="24">
+                    <el-form-item label="银行卡号" prop="bankCardNumber">
+                      <el-input v-model="form.bankCardNumber" placeholder="请输入银行卡号" />
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+              </div>
             </template>
-            <template v-if="storeTab2actionPage == '1'">
-              <el-descriptions-item label="开户行">{{form.bankName}}</el-descriptions-item>
-              <el-descriptions-item label="姓名">{{form.bankUserName}}</el-descriptions-item>
-              <el-descriptions-item label="银行卡号">{{form.bankCardNumber}}</el-descriptions-item>
-            </template>
-          </el-descriptions>
-          <template v-if="storeTab2actionPage == '0'">
-            <el-form-item label="开户行" prop="bankName">
-              <el-input v-model="form.bankName" />
-            </el-form-item>
-            <el-form-item label="姓名" prop="bankUserName">
-              <el-input v-model="form.bankUserName" />
-            </el-form-item>
-            <el-form-item label="银行卡号" prop="bankCardNumber">
-              <el-input v-model="form.bankCardNumber" />
-            </el-form-item>
           </template>
-        </template>
-      </el-form>
-    </el-row>
+        </el-form>
+      </el-row>
+    </el-card>
   </div>
 </template>
 
@@ -298,8 +333,64 @@ export default {
   }
 };
 </script>
-<style>
-.action1 {
+<style lang="scss" scoped>
+.app-container {
+  padding: 20px;
+  
+  .box-card {
+    margin-bottom: 20px;
+    
+    .store-tabs {
+      margin-bottom: 20px;
+    }
+  }
+
+  .store-form {
+    max-width: 1000px;
+    margin: 0 auto;
+  }
+
+  .store-descriptions {
+    margin-bottom: 20px;
+    
+    .description-content {
+      color: #606266;
+      font-size: 14px;
+    }
+  }
+
+  .store-image {
+    width: 120px;
+    height: 120px;
+    border-radius: 4px;
+    box-shadow: 0 2px 12px 0 rgba(0,0,0,0.1);
+  }
+
+  .edit-form {
     margin-top: 20px;
+    padding: 20px;
+    background-color: #f5f7fa;
+    border-radius: 4px;
+
+    .full-width {
+      width: 100%;
+    }
+
+    .el-form-item {
+      margin-bottom: 20px;
+    }
+  }
+
+  .el-button {
+    margin-left: 10px;
+    
+    i {
+      margin-right: 5px;
+    }
+  }
+
+  .el-tag {
+    margin-right: 5px;
+  }
 }
 </style>

yiqi-common/src/main/java/com/yiqi/order/domain/OrderClothItem.java

@@ -235,22 +235,8 @@ public class OrderClothItem extends BaseEntity
     @ApiModelProperty("取衣时间")
     private Date takeClothTime;
 
-    @ApiModelProperty("工厂结算金额")
-    private BigDecimal factorySettlementAmount;
-
-    @ApiModelProperty("材料结算金额")
-    private BigDecimal materialAmount;
-
-    @ApiModelProperty("管理结算金额")
-    private BigDecimal manageAmount;
-
     @ApiModelProperty("工厂结算费率")
     private BigDecimal factorySettlementRate;
 
-    @ApiModelProperty("工厂结算费率")
-    private BigDecimal materialRate;
-
-    @ApiModelProperty("工厂结算费率")
-    private BigDecimal manageRate;
 
 }

yiqi-common/src/main/java/com/yiqi/order/domain/OrderPurchaseGoodsSku.java

@@ -64,5 +64,8 @@ public class OrderPurchaseGoodsSku extends BaseEntity
     @ApiModelProperty("商品ID")
     private Long goodsId;
 
-
+    /** 商品名称 */
+    @Excel(name = "商品名称")
+    @ApiModelProperty("商品名称")
+    private String goodsName;
 }

yiqi-core/src/main/java/com/yiqi/core/service/impl/SettlementManageBillServiceImpl.java

@@ -767,8 +767,8 @@ public class SettlementManageBillServiceImpl extends ServiceImpl<SettlementManag
         BigDecimal managetAmount = CurrencyUtil.mul(settlementFactoryRate.getManagementRate(), orderClothItemTotalPrice);
         settlementManageFactory.setManageAmount(managetAmount);
         //工厂结算金额总和
-        BigDecimal factorySettlementAmount = orderClothItemList.stream().map(OrderClothItem::getFactorySettlementAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
-        settlementManageFactory.setFactorySettlementAmount(factorySettlementAmount);
+//        BigDecimal factorySettlementAmount = orderClothItemList.stream().map(OrderClothItem::getFactorySettlementAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
+//        settlementManageFactory.setFactorySettlementAmount(factorySettlementAmount);
         // 工厂消费 = 材料费+ 管理费
         BigDecimal payMoney = settlementManageFactory.getManageAmount().add(settlementManageFactory.getMaterialAmount());
         // 工厂实际收入 = 工厂结算金额总和 - 工厂消费
@@ -776,9 +776,9 @@ public class SettlementManageBillServiceImpl extends ServiceImpl<SettlementManag
         settlementManageFactoryService.save(settlementManageFactory);
 
         // 设置账单洗衣费
-        settlementManageBill.setWashClothAmount(
-                orderClothItemList.stream().map(OrderClothItem::getFactorySettlementAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)
-        );
+//        settlementManageBill.setWashClothAmount(
+//                orderClothItemList.stream().map(OrderClothItem::getFactorySettlementAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add)
+//        );
         settlementManageBill.setStatus(SettlementBillStatusType.WAITING.getCode());
         this.updateById(settlementManageBill);
     }
@@ -830,14 +830,8 @@ public class SettlementManageBillServiceImpl extends ServiceImpl<SettlementManag
      */
     private void buildHasClothFactory(SettlementManageFactory settlementManageFactory, List<OrderClothItem> orderClothItemList) {
         // 工厂结算金额总和
-        settlementManageFactory.setFactorySettlementAmount(
-                orderClothItemList.stream().map(OrderClothItem::getFactorySettlementAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
         // 材料结算金额总和
-        settlementManageFactory.setMaterialAmount(
-                orderClothItemList.stream().map(OrderClothItem::getMaterialAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
         // 管理结算金额总和
-        settlementManageFactory.setManageAmount(
-                orderClothItemList.stream().map(OrderClothItem::getManageAmount).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
         // 总交易金额
         settlementManageFactory.setTotalTransactionAmount(
                 orderClothItemList.stream().map(OrderClothItem::getTotalPrice).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderClothServiceImpl.java

@@ -572,45 +572,6 @@ public class OrderClothServiceImpl extends ServiceImpl<OrderClothMapper, OrderCl
         return OrderPayResultVO.payError("请重新支付");
     }
 
-    private void buildSettlement(OrderCloth orderCloth, List<OrderClothItem> orderClothItems) {
-        SysSettlementRate factoryRate = sysSettlementRateService.getOne(new QueryWrapper<SysSettlementRate>()
-                .lambda().eq(SysSettlementRate::getSourceType, SourceType.FACTORY.getCode())
-                .eq(SysSettlementRate::getOrgId, orderCloth.getFactoryId()));
-
-        SysSettlementRate storeRate = null;
-        if (orderCloth.getSourceType().equals(SourceType.STORE.getCode())) {
-            storeRate = sysSettlementRateService.getOne(new QueryWrapper<SysSettlementRate>()
-                    .lambda().eq(SysSettlementRate::getSourceType, orderCloth.getSourceType())
-                    .eq(SysSettlementRate::getOrgId, orderCloth.getOrgId()));
-        }
-
-        for (OrderClothItem orderClothItem : orderClothItems) {
-            if (orderCloth.getSourceType().equals(SourceType.STORE.getCode())) {
-                orderClothItem.setFactorySettlementRate(storeRate.getFactoryRate());
-            } else {
-                orderClothItem.setFactorySettlementRate(factoryRate.getFactoryRate());
-            }
-
-            orderClothItem.setMaterialRate(factoryRate.getMaterialRate());
-            orderClothItem.setManageRate(factoryRate.getManageRate());
-            if (orderClothItem.getFactorySettlementRate() == null) {
-                orderClothItem.setFactorySettlementAmount(BigDecimal.ZERO);
-            } else {
-                orderClothItem.setFactorySettlementAmount(orderClothItem.getTotalPrice().multiply(orderClothItem.getFactorySettlementRate()));
-            }
-            if (orderClothItem.getMaterialRate() == null) {
-                orderClothItem.setMaterialAmount(BigDecimal.ZERO);
-            } else {
-                orderClothItem.setMaterialAmount(orderClothItem.getFactorySettlementAmount().multiply(orderClothItem.getMaterialRate()));
-            }
-            if (orderClothItem.getManageRate() == null) {
-                orderClothItem.setManageAmount(BigDecimal.ZERO);
-            } else {
-                orderClothItem.setManageAmount(orderClothItem.getFactorySettlementAmount().multiply(orderClothItem.getManageRate()));
-            }
-        }
-    }
-
     private void buildOrderCoupon(OrderCloth orderCloth, List<OrderClothItem> orderClothItems, List<OrderCouponDTO> orderCouponDTOS) {
         if (orderCouponDTOS == null || orderCouponDTOS.size() == 0) {
             return;

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderPurchaseGoodsServiceImpl.java

@@ -31,7 +31,6 @@ import com.yiqi.order.domain.vo.OrderDeliveryPathVO;
 import com.yiqi.order.domain.vo.OrderPurchaseGoodsInfoVO;
 import com.yiqi.order.domain.vo.OrderPurchaseGoodsVO;
 import com.yiqi.order.domain.vo.OrderSellGoodsListVO;
-import com.yiqi.order.service.IOrderPurchaseGoodsItemService;
 import com.yiqi.order.service.IOrderPurchaseGoodsSkuService;
 import com.yiqi.order.service.IThirdDeliveryService;
 import com.yiqi.system.domain.ManageFactory;
@@ -53,8 +52,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  */
 @Service
 public class OrderPurchaseGoodsServiceImpl extends ServiceImpl<OrderPurchaseGoodsMapper, OrderPurchaseGoods> implements IOrderPurchaseGoodsService {
-    @Autowired
-    IOrderPurchaseGoodsItemService orderPurchaseGoodsItemService;
     @Autowired
     IOrderPurchaseGoodsSkuService orderPurchaseGoodsSkuService;
     @Autowired
@@ -383,9 +380,9 @@ public class OrderPurchaseGoodsServiceImpl extends ServiceImpl<OrderPurchaseGood
     }
 
     private List<GoodsInfo> getGoodsInfoListByOrderPurchase(OrderPurchaseGoods orderPurchaseGoods) {
-        List<OrderPurchaseGoodsItem> purchaseGoodsItems = orderPurchaseGoodsItemService.list(new QueryWrapper<OrderPurchaseGoodsItem>().lambda()
-                .eq(OrderPurchaseGoodsItem::getOrderId, orderPurchaseGoods.getId()));
-        List<Long> goodIdList = new ArrayList<>(purchaseGoodsItems.stream().collect(Collectors.groupingBy(OrderPurchaseGoodsItem::getGoodsId)).keySet());
+        List<OrderPurchaseGoodsSku> purchaseGoodsItems = orderPurchaseGoodsSkuService.list(new QueryWrapper<OrderPurchaseGoodsSku>().lambda()
+                .eq(OrderPurchaseGoodsSku::getOrderId, orderPurchaseGoods.getId()));
+        List<Long> goodIdList = new ArrayList<>(purchaseGoodsItems.stream().collect(Collectors.groupingBy(OrderPurchaseGoodsSku::getGoodsId)).keySet());
         return goodsInfoService.list(new QueryWrapper<GoodsInfo>().lambda().in(GoodsInfo::getId, goodIdList));
     }
 
@@ -550,7 +547,6 @@ public class OrderPurchaseGoodsServiceImpl extends ServiceImpl<OrderPurchaseGood
         if (!SourceType.MANAGER.getCode().equals(user.getUserType())) {
             orderPurchaseGoods.setOrderStatus(purchaseGoodsStatusType.CONFIRM_PAY.getCode());
             orderPurchaseGoods.setOrgId(SourceType.STORE.getCode().equals(user.getUserType()) ? user.getStoreId() : user.getFactoryId());
-
             orderPurchaseGoods.setParentSourceType(SourceType.FACTORY.getCode().equals(user.getUserType()) ? SourceType.MANAGER.getCode() : SourceType.FACTORY.getCode());
             if (SourceType.STORE.getCode().equals(user.getUserType())) {
                 orderPurchaseGoods.setParentOrgId(sysStoreService.selectSysStoreById(user.getStoreId()).getFactoryId());
@@ -575,10 +571,10 @@ public class OrderPurchaseGoodsServiceImpl extends ServiceImpl<OrderPurchaseGood
         // 材料进货，设置是否抵扣金额
         if (GoodsType.MATERIAL.getCode().equals(orderPurchaseGoodsAddDTO.getGoodsType()) && orderPurchaseGoodsAddDTO.getIsUserBalance()) {
             orderPurchaseGoods.setIsUseBalance(SysBoolType.YES.getCode());
-            this.handleSetBalanceDeductAmount(orderPurchaseGoods);
+//            this.handleSetBalanceDeductAmount(orderPurchaseGoods);
             // 保存记录
-            SettlementBalanceRecord settlementBalanceRecord = SettlementBalanceRecord.buildConsumeBalanceRecordByPurchaseOrder(orderPurchaseGoods);
-            settlementBalanceRecordService.save(settlementBalanceRecord);
+//            SettlementBalanceRecord settlementBalanceRecord = SettlementBalanceRecord.buildConsumeBalanceRecordByPurchaseOrder(orderPurchaseGoods);
+//            settlementBalanceRecordService.save(settlementBalanceRecord);
         } else {
             orderPurchaseGoods.setIsUseBalance(SysBoolType.NO.getCode());
         }
@@ -588,25 +584,15 @@ public class OrderPurchaseGoodsServiceImpl extends ServiceImpl<OrderPurchaseGood
         if (CollUtil.isEmpty(purchaseGoodsVOList)) {
             throw new GlobalException("操作失败,商品信息为空");
         }
-        // 无法批量插入， 不然orderPurchaseGoodsSku.setOrderPurchaseGoodsItemId的值不好拿
+        // 无法批量插入
         for (OrderPurchaseGoodsVO orderPurchaseGoodsVO : purchaseGoodsVOList) {
-            OrderPurchaseGoodsItem orderPurchaseGoodsItem = new OrderPurchaseGoodsItem();
-            orderPurchaseGoodsItem.setOrderId(orderPurchaseGoods.getId());
-            orderPurchaseGoodsItem.setGoodsId(orderPurchaseGoodsVO.getGoodsId());
-            orderPurchaseGoodsItem.setGoodsCategoryId(orderPurchaseGoodsVO.getGoodsCategoryId());
-            orderPurchaseGoodsItem.setGoodsCategoryName(orderPurchaseGoodsVO.getGoodsCategoryName());
-            orderPurchaseGoodsItem.setCreateBy(user.getCreateBy());
-            orderPurchaseGoodsItem.setCreateTime(DateUtils.getNowDate());
-            orderPurchaseGoodsItem.setCreateById(user.getUserId());
-            orderPurchaseGoodsItemService.save(orderPurchaseGoodsItem);
-
             OrderPurchaseGoodsSku orderPurchaseGoodsSku = new OrderPurchaseGoodsSku();
             orderPurchaseGoodsSku.setOrderId(orderPurchaseGoods.getId());
-            orderPurchaseGoodsSku.setOrderPurchaseGoodsItemId(orderPurchaseGoodsItem.getId());
             orderPurchaseGoodsSku.setBuyNum(orderPurchaseGoodsVO.getBuyNum());
             orderPurchaseGoodsSku.setCostPrice(orderPurchaseGoodsVO.getCostPrice());
             orderPurchaseGoodsSku.setSkuName(orderPurchaseGoodsVO.getSkuName());
             orderPurchaseGoodsSku.setSkuId(orderPurchaseGoodsVO.getSkuId());
+            orderPurchaseGoodsSku.setGoodsName(orderPurchaseGoodsVO.getGoodsName());
             orderPurchaseGoodsSku.setGoodsId(orderPurchaseGoodsVO.getGoodsId());
             orderPurchaseGoodsSku.setCreateBy(user.getCreateBy());
             orderPurchaseGoodsSku.setCreateTime(DateUtils.getNowDate());
@@ -632,31 +618,31 @@ public class OrderPurchaseGoodsServiceImpl extends ServiceImpl<OrderPurchaseGood
             }
             balance = store.getMaterialBalance() == null ? BigDecimal.ZERO : store.getMaterialBalance();
         }
-        BigDecimal lastBalance = BigDecimal.ZERO;
-        if (BigDecimal.ZERO.equals(balance)) {
-            // 余额为0 ，所以抵扣金额=0
-            orderPurchaseGoods.setBalanceDeductAmount(BigDecimal.ZERO);
-            return;
-        } else if (balance.compareTo(orderPurchaseGoods.getCostTotalPrice()) < 0) {
-            // 余额 小于 订单金额， 余额全部抵扣
-            orderPurchaseGoods.setBalanceDeductAmount(balance);
-        } else {
-            // 余额 大于等于 订单金额， 订单金额全部抵扣
-            orderPurchaseGoods.setBalanceDeductAmount(orderPurchaseGoods.getCostTotalPrice());
-            lastBalance = balance.subtract(orderPurchaseGoods.getCostTotalPrice());
-        }
-        // 更新工厂余额
-        if (SourceType.FACTORY.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
-            manageFactoryService.update(new UpdateWrapper<ManageFactory>().lambda()
-                    .eq(ManageFactory::getId, SecurityUtils.getLoginUser().getUser().getFactoryId())
-                    .set(ManageFactory::getBalance, lastBalance));
-        }
-        // 更新门店余额
-        if (SourceType.STORE.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
-            sysStoreService.update(new UpdateWrapper<SysStore>().lambda()
-                    .eq(SysStore::getId, SecurityUtils.getLoginUser().getUser().getStoreId())
-                    .set(SysStore::getMaterialBalance, lastBalance));
-        }
+//        BigDecimal lastBalance = BigDecimal.ZERO;
+//        if (BigDecimal.ZERO.equals(balance)) {
+//            // 余额为0 ，所以抵扣金额=0
+//            orderPurchaseGoods.setBalanceDeductAmount(BigDecimal.ZERO);
+//            return;
+//        } else if (balance.compareTo(orderPurchaseGoods.getCostTotalPrice()) < 0) {
+//            // 余额 小于 订单金额， 余额全部抵扣
+//            orderPurchaseGoods.setBalanceDeductAmount(balance);
+//        } else {
+//            // 余额 大于等于 订单金额， 订单金额全部抵扣
+//            orderPurchaseGoods.setBalanceDeductAmount(orderPurchaseGoods.getCostTotalPrice());
+//            lastBalance = balance.subtract(orderPurchaseGoods.getCostTotalPrice());
+//        }
+//        // 更新工厂余额
+//        if (SourceType.FACTORY.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
+//            manageFactoryService.update(new UpdateWrapper<ManageFactory>().lambda()
+//                    .eq(ManageFactory::getId, SecurityUtils.getLoginUser().getUser().getFactoryId())
+//                    .set(ManageFactory::getBalance, lastBalance));
+//        }
+//        // 更新门店余额
+//        if (SourceType.STORE.getCode().equals(SecurityUtils.getLoginUser().getSourceType())) {
+//            sysStoreService.update(new UpdateWrapper<SysStore>().lambda()
+//                    .eq(SysStore::getId, SecurityUtils.getLoginUser().getUser().getStoreId())
+//                    .set(SysStore::getMaterialBalance, lastBalance));
+//        }
 
     }
 

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderPurchaseGoodsSkuServiceImpl.java

@@ -1,8 +1,16 @@
 package com.yiqi.order.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yiqi.common.utils.DateUtils;
 import com.yiqi.common.utils.SecurityUtils;
+import com.yiqi.core.domain.GoodsInfo;
+import com.yiqi.core.service.IGoodsInfoService;
+import com.yiqi.order.domain.OrderPurchaseGoods;
+import com.yiqi.order.domain.OrderPurchaseGoodsItem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.yiqi.order.mapper.OrderPurchaseGoodsSkuMapper;
@@ -19,6 +27,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class OrderPurchaseGoodsSkuServiceImpl extends ServiceImpl<OrderPurchaseGoodsSkuMapper,OrderPurchaseGoodsSku> implements IOrderPurchaseGoodsSkuService {
 
+    @Autowired
+    private IGoodsInfoService goodsInfoService;
+
     /**
      * 查询商品订单物料明细
      *
@@ -41,6 +52,13 @@ public class OrderPurchaseGoodsSkuServiceImpl extends ServiceImpl<OrderPurchaseG
         return baseMapper.selectOrderPurchaseGoodsSkuList(orderPurchaseGoodsSku);
     }
 
+    private List<GoodsInfo> getGoodsInfoListByOrderPurchase(OrderPurchaseGoods orderPurchaseGoods) {
+        List<OrderPurchaseGoodsSku> purchaseGoodsItems = list(new QueryWrapper<OrderPurchaseGoodsSku>().lambda()
+                .eq(OrderPurchaseGoodsSku::getOrderId, orderPurchaseGoods.getId()));
+        List<Long> goodIdList = new ArrayList<>(purchaseGoodsItems.stream().collect(Collectors.groupingBy(OrderPurchaseGoodsSku::getGoodsId)).keySet());
+        return goodsInfoService.list(new QueryWrapper<GoodsInfo>().lambda().in(GoodsInfo::getId, goodIdList));
+    }
+
     /**
      * 新增商品订单物料明细
      *

yiqi-core/src/main/resources/mapper/order/OrderPurchaseGoodsMapper.xml

@@ -99,12 +99,10 @@
 
     <select id="selectOrderPurchaseGoodsById" parameterType="Long"
             resultType="com.yiqi.order.domain.vo.OrderPurchaseGoodsVO">
-        select c.goods_category_name as goodsCategoryName,
-               e.goods_name as goodsName, a.sku_name as skuName, a.buy_num as buyNum,
+        select e.goods_name as goodsName, a.sku_name as skuName, a.buy_num as buyNum,
                a.cost_price as costPrice, b.cost_total_price as costTotalPrice
         from order_purchase_goods_sku a
                  left join order_purchase_goods b on a.order_id = b.id
-                 left join order_purchase_goods_item c on a.order_id = a.order_id and a.order_purchase_goods_item_id = c.id
                  left join goods_info e on e.id = a.goods_id
         where a.order_id = #{id}
     </select>