no message

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

@@ -30,7 +30,7 @@
               <zj-form-module title="" label-width="120px" :form-data="formData" :form-items="formItem" />
             </zj-form-container>
           </zj-page-fill>
-          <div style="box-sizing: border-box; padding: 10px 10px 0">
+          <div style="box-sizing: border-box; padding: 10px 10px 0; text-align: right">
             <el-button type="primary" @click="save">保存</el-button>
             <el-button @click="chongzhi">重置</el-button>
           </div>

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

@@ -163,8 +163,8 @@
               <el-form-item label="库存管理方式" prop="joinCode">
                 <el-radio-group v-model="step1Form.joinCode">
                   <el-radio label="NO">不管理</el-radio>
-                  <el-radio label="CODE">管条码</el-radio>
                   <el-radio label="NUM">管数量</el-radio>
+                  <el-radio label="CODE">管条码</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -600,6 +600,7 @@ export default {
         expireTime: '',
         moduleMaterialPart: false,
         moduleYb: false,
+        joinCode: 'NUM',
         moduleWb: false,
         storePay: false,
         yjhxDkFlag: 1
@@ -791,6 +792,7 @@ export default {
             moduleMaterialPart: this.step1Form.moduleMaterialPart,
             moduleYb: this.step1Form.moduleYb,
             moduleWb: this.step1Form.moduleWb,
+            joinCode: this.step1Form.joinCode,
             storePay: this.step1Form.storePay,
             yjhxDkFlag: this.step1Form.yjhxDkFlag,
 

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

@@ -110,8 +110,8 @@
               <el-form-item label="库存管理方式" prop="joinCode">
                 <el-radio-group v-model="step1Form.joinCode">
                   <el-radio label="NO">不管理</el-radio>
-                  <el-radio label="CODE">管条码</el-radio>
                   <el-radio label="NUM">管数量</el-radio>
+                  <el-radio label="CODE">管条码</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>