linwenxin před 1 rokem
rodič
revize
a75ec62896

+ 16 - 10
src/views/setting/agreement/index.vue

@@ -1,9 +1,13 @@
 <template>
   <div class="app-container">
-    <!-- tradeContent -->
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="用户协议" name="first"></el-tab-pane>
+      <el-tab-pane label="隐私声明" name="second"></el-tab-pane>
+      <el-tab-pane label="服务协议" name="third"></el-tab-pane>
+      <el-tab-pane label="以旧换新协议" name="fourth"></el-tab-pane>
+    </el-tabs>
 
-    <div class="title">用户协议</div>
-    <el-form ref="mainForm" label-width="80px" label-position="top">
+    <el-form v-show="activeName=='first'" ref="mainForm" label-width="80px" label-position="top">
       <el-form-item label="" prop="content1">
         <el-upload
           ref="imageListUpload1"
@@ -28,8 +32,7 @@
       </el-form-item>
     </el-form>
 
-    <div class="title">隐私声明</div>
-    <el-form ref="mainForm" label-width="80px" label-position="top">
+    <el-form v-show="activeName=='second'" ref="mainForm" label-width="80px" label-position="top">
       <el-form-item label="" prop="content2">
         <el-upload
           ref="imageListUpload2"
@@ -54,8 +57,7 @@
       </el-form-item>
     </el-form>
 		
-		<div class="title">服务协议</div>
-		<el-form ref="mainForm" label-width="80px" label-position="top">
+		<el-form v-show="activeName=='third'" ref="mainForm" label-width="80px" label-position="top">
 		  <el-form-item label="" prop="content3">
 		    <el-upload
 		      ref="imageListUpload3"
@@ -80,8 +82,7 @@
 		  </el-form-item>
 		</el-form>
 
-    <div class="title">以旧换新协议</div>
-		<el-form ref="mainForm" label-width="80px" label-position="top">
+		<el-form v-show="activeName=='fourth'" ref="mainForm" label-width="80px" label-position="top">
 		  <el-form-item label="" prop="content4">
 		    <el-upload
 		      ref="imageListUpload4"
@@ -147,6 +148,7 @@ export default {
   },
   data() {
     return {
+      activeName: 'first',
       baseURL: process.env.VUE_APP_BASE_API,
       myHeaders: {'x-token': getToken()},
 
@@ -458,7 +460,11 @@ export default {
     font-weight: 600;
   }
   
-  .avatar-uploader1 {
+  .avatar-uploader1,
+  .avatar-uploader2,
+  .avatar-uploader3,
+  .avatar-uploader4 {
     height: 0;
+    overflow: hidden;
   }
 </style>

+ 5 - 3
src/views/setting/organizationManagement/settledManagement/index.vue

@@ -106,12 +106,14 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="商品出入库" prop="joinCode">
-                <el-switch v-model="step1Form.joinCode" active-text="关联条码" inactive-text="不关联条码" active-color="#13ce66" inactive-color="#ff4949">
-                </el-switch>
+                <el-radio-group v-model="step1Form.yjhxDkFlag">
+                  <el-radio :label="true">关联条码</el-radio>
+                  <el-radio :label="false">不关联条码</el-radio>
+                </el-radio-group>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="租业务" prop="moduleZl">
+              <el-form-item label="租业务" prop="moduleZl">
                 <el-switch v-model="step1Form.moduleZl" active-color="#13ce66" inactive-color="#ff4949">
                 </el-switch>
               </el-form-item>

+ 5 - 5
src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -90,13 +90,13 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="商品出入库" prop="joinCode">
-                <el-switch v-model="step1Form.joinCode" active-text="关联条码" inactive-text="不关联条码" active-color="#13ce66" inactive-color="#ff4949">
-                </el-switch>
-              </el-form-item>
+              <el-radio-group v-model="step1Form.yjhxDkFlag">
+                <el-radio :label="true">关联条码</el-radio>
+                <el-radio :label="false">不关联条码</el-radio>
+              </el-radio-group>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="租业务" prop="moduleZl">
+              <el-form-item label="租业务" prop="moduleZl">
                 <el-switch v-model="step1Form.moduleZl" active-color="#13ce66" inactive-color="#ff4949">
                 </el-switch>
               </el-form-item>