商户配置增加字段

src/views/mallManagement/settlement/index.vue

@@ -81,6 +81,36 @@ export default {
     exportList: orderSharePageExport,
     // 表格列解析渲染数据更改
     columnParsing(item, defaultData) {
+			if (item.jname === 'orderId') {
+				defaultData.render = (h, { row, index, column }) => {
+					return (
+						<div style="padding:0 6px;cursor: pointer;" class={{ 'text-view': true, 'text-view-copy': column.isCopy }}>
+							<span style="color:#008dd4;" onClick={() => {
+									this.$router.push({
+										name: "order_detail",
+										params: {
+										  pageName: row.orderId,
+										  pageType: 'detail',
+										  pageCode: row.orderId
+										},
+										query: {
+										  id: row.orderId,
+										  orderId: row.orderId
+										}
+									})
+							}}>{row.orderId}</span>
+							{(column.isCopy && row.orderId) ? (
+								<i
+									style="color:#008dd4;"
+									class={['el-icon-document-copy', column.columnCopyClass]}
+									data-clipboard-text={row[column.columnAttributes.prop]}
+								></i>
+							) : null}
+						</div>
+					)
+				}
+				defaultData.columnAttributes.width = 200
+			}
       return defaultData
     },
     // 监听勾选变化

src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -327,7 +327,7 @@
     </div>
 
     <div v-show="step == 'four'">
-      <el-form ref="step4Form" :model="step4Form" :rules="step4FormRules" label-width="100px" label-position="right">
+      <el-form ref="step4Form" :model="step4Form" :rules="step4FormRules" label-width="120px" label-position="right">
         <h4>说明：将按照T+N天自动把销售订单“待结算”状态转为“可提现”状态，T为订单支付成功的日期。</h4>
         <h5>自动结算频率</h5>
         <el-form-item label="N等于" prop="dayNum">
@@ -340,6 +340,12 @@
           <el-time-picker v-model="step4Form.hourTime" value-format="HH:mm:ss" placeholder="选择执行时间">
           </el-time-picker>
         </el-form-item>
+		<el-form-item label="手续费承担方式" prop="isShareTax" class="is-required">
+		  <el-radio-group v-model="step4Form.isShareTax">
+		      <el-radio :label="false">商户承担</el-radio>
+		      <el-radio :label="true">各自承担</el-radio>
+		  </el-radio-group>
+		</el-form-item>
       </el-form>
     </div>
 
@@ -578,7 +584,8 @@ export default {
       },
       step4Form: {
         dayNum: '',
-        hourTime: ''
+        hourTime: '',
+		isShareTax: false
       },
       step4FormRules: {
         dayNum: [
@@ -681,6 +688,7 @@ export default {
 
         this.step4Form.dayNum = res.data.dayNum
         this.step4Form.hourTime = res.data.hourTime
+				this.step4Form.isShareTax = res.data.isShareTax
       })
     },
 
@@ -887,6 +895,7 @@ export default {
             companyWechatId: this.companyWechatId,
             dayNum: this.step4Form.dayNum,
             hourTime: this.step4Form.hourTime,
+						isShareTax: this.step4Form.isShareTax
           }
           editAccount(params).then(res => {
             this.$successMsg('保存成功');