소스 검색

no message

pengyh 1 년 전
부모
커밋
a648995ddb
2개의 변경된 파일105개의 추가작업 그리고 38개의 파일을 삭제
  1. 82 36
      src/views/setting/departmentManage/index.vue
  2. 23 2
      src/views/userManagement/masterManagement/index.vue

+ 82 - 36
src/views/setting/departmentManage/index.vue

@@ -61,40 +61,56 @@
           </div>
         </div>
         <div v-if="~['add', 'edit'].indexOf(activeKey)">
-          <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-position="top" label-width="80px">
-            <el-form-item label="上级" prop="parentId">
-              <el-cascader style="width: 100%" :options="dataList2"
-                :props="{ checkStrictly: true, value: 'websitId', label: 'name' }" v-model="mainForm.parentId" filterable
-                clearable>
-              </el-cascader>
-            </el-form-item>
-            <el-form-item label="名称" prop="name">
-              <el-input placeholder="请输入网点名称" v-model="mainForm.name"></el-input>
-            </el-form-item>
-            <el-form-item label="联系人" prop="linkName">
-              <el-input placeholder="请输入联系人名称" v-model="mainForm.linkName"></el-input>
-            </el-form-item>
-            <el-form-item label="联系人电话" prop="websitPhone">
-              <el-input placeholder="请输入联系人电话" maxlength="11" type="number" v-model="mainForm.websitPhone"></el-input>
-            </el-form-item>
-            <el-form-item label="地址" prop="address">
-              <div style="display:flex;">
-                <el-input placeholder="请选择地址" style="margin-right: 20px;" v-model="mainForm.address"></el-input>
-                <geographicalPosi :formData="mainForm" @selectPosi="selectAddress"></geographicalPosi>
-              </div>
-            </el-form-item>
-            <el-form-item label="状态" prop="status">
-              <el-radio-group v-model="mainForm.status">
-                <el-radio :label="true">启用</el-radio>
-                <el-radio :label="false">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item label="增值服务" prop="isIncre">
-              <el-radio-group v-model="mainForm.isIncre">
-                <el-radio :label="true">启用</el-radio>
-                <el-radio :label="false">禁用</el-radio>
-              </el-radio-group>
-            </el-form-item>
+          <el-form ref="mainForm" :model="mainForm" :rules="mainFormRules" label-width="100px">
+			<el-row :gutter="20" justify="start">
+				<el-col :span="6">
+					<el-form-item label="上级" prop="parentId">
+					  <el-cascader style="width: 100%" :options="dataList2"
+					    :props="{ checkStrictly: true, value: 'websitId', label: 'name' }" v-model="mainForm.parentId" filterable
+					    clearable>
+					  </el-cascader>
+					</el-form-item>
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="名称" prop="name">
+					  <el-input placeholder="请输入网点名称" v-model="mainForm.name"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="联系人" prop="linkName">
+					  <el-input placeholder="请输入联系人名称" v-model="mainForm.linkName"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="联系人电话" prop="websitPhone">
+					  <el-input placeholder="请输入联系人电话" maxlength="11" type="number" v-model="mainForm.websitPhone"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="地址" prop="address">
+					  <div style="display:flex;">
+					    <el-input placeholder="请选择地址" style="margin-right: 20px;" v-model="mainForm.address"></el-input>
+					    <geographicalPosi :formData="mainForm" @selectPosi="selectAddress"></geographicalPosi>
+					  </div>
+					</el-form-item>
+				</el-col>
+				<el-col :span="6">
+					<el-form-item label="状态" prop="status">
+					  <el-radio-group v-model="mainForm.status">
+					    <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="isIncre">
+					  <el-radio-group v-model="mainForm.isIncre">
+					    <el-radio :label="true">启用</el-radio>
+					    <el-radio :label="false">禁用</el-radio>
+					  </el-radio-group>
+					</el-form-item>
+				</el-col>
+			</el-row>
             <!-- <el-form-item v-if="mainForm.type == 'B'" label="商品出入库" prop="joinCode">
               <el-radio-group v-model="mainForm.joinCode">
                 <el-radio :label="true">关联条码</el-radio>
@@ -102,7 +118,7 @@
               </el-radio-group>
             </el-form-item> -->
           </el-form>
-          <div slot="footer" class="dialog-footer">
+          <div class="footer">
             <el-button @click="data.removeTab()">取 消</el-button>
             <el-button type="primary" @click="submitMainForm(data.removeTab)">确 定</el-button>
           </div>
@@ -344,4 +360,34 @@ export default {
 }
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+	.footer {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		z-index: 1;
+		width: 100%;
+		background: #fff;
+		padding: 15px 40px;
+		box-sizing: border-box;
+		transition: all 0.28s;
+		text-align: right;
+		box-shadow: 0 2px 5px 0 rgb(0 0 0 / 50%), 0 2px 5px 0 rgb(0 0 0 / 10%);
+	
+		&.hideSidebar {
+			margin-left: 54px;
+			width: calc(100vw - 54px);
+		}
+	
+		&.openSidebar {
+			margin-left: 210px;
+			width: calc(100vw - 210px);
+		}
+	
+		.tips {
+			font-size: 12px;
+			color: red;
+			margin-top: 10px;
+		}
+	}
+</style>

+ 23 - 2
src/views/userManagement/masterManagement/index.vue

@@ -36,7 +36,7 @@
       </div>
       <div v-if="~['examine', 'detail'].indexOf(activeKey)" style="box-sizing: border-box;padding: 16px;">
         <zj-form-container ref="formRef" :form-data="formData" :styleSwitch="false">
-          <zj-form-module :title="data.label" label-width="100px" :showPackUp="false" :form-data="formData"
+          <zj-form-module :title="data.label" label-width="110px" :showPackUp="false" :form-data="formData"
             :form-items="[...formItems,...imageList]">
           </zj-form-module>
         </zj-form-container>
@@ -84,6 +84,7 @@ export default {
 		mobile: '',
 		idCard: '',
 		bankAccount: '',
+		isEs: false,
         examineRemark: '',
         examineStatus: '',
 		idCardImg: []
@@ -204,7 +205,26 @@ export default {
           prop: 'bankAccount',
           rules: []
         }
-      }, {
+      },{
+				md: 6,
+				isShow: true,
+				name: 'slot-component',
+				attributes: {},
+				formItemAttributes: {
+					label: '二手商城发布',
+					prop: 'isEs',
+					rules: [...required]
+				},
+				render: (h, { props, onInput }) => {
+					var { value } = props
+					return (
+						<el-radio-group v-model={this.formData.isEs}>
+							<el-radio label={true}>是</el-radio>
+							<el-radio label={false}>否</el-radio>
+						</el-radio-group>
+					)
+				}
+			}, {
         md: 24,
         isShow: true,
         name: 'el-input',
@@ -447,6 +467,7 @@ export default {
 				  userId: this.formData.userId,
 				  websitId: this.formData.websitId,
 				  bankAccount: this.formData.bankAccount,
+					isEs: this.formData.isEs,
 				  idCard: this.formData.idCard,
 				  idCardImg: this.formData.idCardImg[0].url,
 				  name: this.formData.nickName