优化

src/views/auxiliaryFittings/attachmentProfile/index.vue

@@ -370,7 +370,7 @@ export default {
 							}
 							if(e && (this.accAdd(Number(e),Number(that.formData.selfWebsitAmount)) >100)){
 								this.formData.selfWorkerAmount = 0
-								return this.$message.warning('网点与师傅分账比例和最大只能100%！');
+								return this.$message.warning('商户与师傅分账比例和最大只能100%！');
 							}else{
 								that.formData.selfWebsitAmount = this.Subtr(100,e)
 							}
@@ -413,7 +413,7 @@ export default {
         name: 'slot-component',
         attributes: { placeholder: '请输入', type: 'number' },
         formItemAttributes: {
-          label: '自有库存网点分账金额',
+          label: '自有库存商户分账金额',
           prop: 'selfWebsitAmount',
           rules: [...required]
         },
@@ -433,7 +433,7 @@ export default {
         name: 'slot-component',
         attributes: { placeholder: '请输入', type: 'number' },
         formItemAttributes: {
-          label: '网点分账比例',
+          label: '商户分账比例',
           prop: 'selfWebsitAmount',
           rules: [...required]
         },
@@ -446,11 +446,11 @@ export default {
 						<el-input v-model={this.formData.selfWebsitAmount} onChange={(e)=>{
 							this.formData.selfWebsitAmount = Number(this.formData.selfWebsitAmount).toFixed(2)
 							if(e && (Number(e) < 0)){
-								return this.$message.warning('网点分账比例不能为0！');
+								return this.$message.warning('商户分账比例不能为0！');
 							}
 							if(e && (this.accAdd(Number(e),Number(that.formData.selfWorkerAmount)) >100)){
 								this.formData.selfWebsitAmount = 0
-								return this.$message.warning('网点与师傅分账比例和最大只能100%！');
+								return this.$message.warning('商户与师傅分账比例和最大只能100%！');
 							}else{
 								that.formData.selfWorkerAmount = this.Subtr(100,e)
 							}
@@ -465,7 +465,7 @@ export default {
         name: 'slot-component',
         attributes: { placeholder: '请输入', type: 'number' },
         formItemAttributes: {
-          label: '外购辅材网点分账金额',
+          label: '外购辅材商户分账金额',
           prop: 'outWebsitAmount',
           rules: [...required]
         },

src/views/auxiliaryFittings/settleAccountManagement/salesWithdraw/index.vue

@@ -82,7 +82,7 @@
 							<th class="bold" align="center">订单金额</th>
 							<th class="bold" align="center">销售类型</th>
 							<th class="bold" align="center">师傅分账金额</th>
-							<th class="bold" align="center">网点分账金额</th>
+							<th class="bold" align="center">商户分账金额</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -93,7 +93,7 @@
 							<td align="center">{{item.num}}</td>
 							<!-- <td align="center">{{item.goodsAmount}}</td> -->
 							<td align="center">{{item.totalPrice}}</td>
-							<td align="center">{{item.settlementType == 'OWN'?'自由':item.settlementType == 'OUT'?'外购':''}}</td>
+							<td align="center">{{item.settlementType == 'OWN'?'自有':item.settlementType == 'OUT'?'外购':''}}</td>
 							<td align="center">{{item.workerAmount}}</td>
 							<td align="center">{{item.websitAmount}}</td>
 						</tr>

src/views/auxiliaryFittings/settleAccountManagement/settleAccount/index.vue

@@ -82,8 +82,14 @@
 					<tr>
 						<td class="bold" align="center">师傅分账金额</td>
 						<td>{{formData.workerAmount}}</td>
-						<td class="bold" align="center">网点分账金额</td>
+						<td class="bold" align="center">师傅分账金额手续费</td>
+						<td>{{formData.workerProceAmount}}</td>
+					</tr>
+					<tr>
+						<td class="bold" align="center">商户分账金额</td>
 						<td>{{formData.websitAmount}}</td>
+						<td class="bold" align="center">商户分账金额手续费</td>
+						<td>{{formData.websitProceAmount}}</td>
 					</tr>
 					<tr>
 						<td class="bold" align="center">操作人</td>
@@ -107,7 +113,7 @@
 							<th class="bold" align="center">订单金额</th>
 							<th class="bold" align="center">销售类型</th>
 							<th class="bold" align="center">师傅分账金额</th>
-							<th class="bold" align="center">网点分账金额</th>
+							<th class="bold" align="center">商户分账金额</th>
 						</tr>
 					</thead>
 					<tbody>
@@ -117,13 +123,13 @@
 							<td align="center">{{item.num}}</td>
 							<td align="center">{{item.goodsAmount}}</td>
 							<td align="center">{{item.totalAmount}}</td>
-							<td align="center">{{item.settlementType == 'OWN'?'自由':item.settlementType == 'OUT'?'外购':''}}</td>
+							<td align="center">{{item.settlementType == 'OWN'?'自有':item.settlementType == 'OUT'?'外购':''}}</td>
 							<td align="center">{{item.workerAmount}}</td>
 							<td align="center">{{item.websitAmount}}</td>
 						</tr>
-						<tr>
+						<!-- <tr>
 							<td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
-						</tr>
+						</tr> -->
 						<tr>
 							<td align="center">总计</td><td></td><td></td><td></td>
 							<td align="center">{{totalAmount}}</td><td></td>