暂存

src/App.vue

@@ -3,7 +3,26 @@
     <router-view/>
   </div>
 </template>
-
+<script>
+  export default{
+    data () {
+      return {}
+    },
+    methods:{},
+    watch: {
+      $route(to,from) {
+        console.log(to,from)
+        let at_modules = JSON.parse(sessionStorage.getItem('active_modules'))
+        to.meta.modules = at_modules
+        let app = to.meta.modules.apps.filter(e=>{
+          if (e.name === to.name) return e
+        })
+        console.log(app)
+        // this.$store.dispatch('setActiveApp',{app:app[0],val:''})
+      }
+    }
+  }
+</script>
 <style>
 body{
   font:16px/1.5 Helvetica Neue,Helvetica,Arial,Microsoft Yahei,Hiragino Sans GB,Heiti SC,WenQuanYi Micro Hei,sans-serif;

src/Form/EnterpriseArchives/add.vue

@@ -1,51 +1,53 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="dialogFormVisible = true">新 建</el-button>
-    <el-dialog title="新 建" :visible.sync="dialogFormVisible">
-      <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
-          <el-col :span="24">
-            <el-form-item label="企业名称" prop="enterprisename">
-              <el-input v-model="form.enterprisename" placeholder="输入企业名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="联系人" prop="contact">
-              <el-input v-model="form.contact" placeholder="输入企业联系人"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="联系电话" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="输入联系电话"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="税号" prop="taxno">
-              <el-input v-model="form.taxno" placeholder="输入税号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="14">
-            <el-form-item label="省市县" prop="value">
-              <el-cascader
-                style="width:100%"
-                v-model="form.value"
-                :options="basicData.data().areaData"
-                @change="cascaderChange" clearable>
-              </el-cascader>
-            </el-form-item>
-          </el-col>
-          <el-col :span="14">
-            <el-form-item label="详细地址" prop="address">
-              <el-input v-model="form.address" type="textarea" :rows="3" placeholder="输入详细地址"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-      <div class="dialog-footer">
+    <el-drawer title="新建档案" direction="rtl" append-to-body :visible.sync="dialogFormVisible">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
+            <el-col :span="24">
+              <el-form-item label="企业名称" prop="enterprisename">
+                <el-input v-model="form.enterprisename" placeholder="输入企业名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系人" prop="contact">
+                <el-input v-model="form.contact" placeholder="输入企业联系人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系电话" prop="phonenumber">
+                <el-input v-model="form.phonenumber" placeholder="输入联系电话"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="省市县" prop="value">
+                <el-cascader
+                  style="width:100%"
+                  v-model="form.value"
+                  :options="basicData.data().areaData"
+                  @change="cascaderChange" clearable>
+                </el-cascader>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="税号" prop="taxno">
+                <el-input v-model="form.taxno" placeholder="输入税号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="详细地址" prop="address">
+                <el-input v-model="form.address" type="textarea" :rows="3" placeholder="输入详细地址"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
         <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
    
     
   </div>

src/Form/EnterpriseArchives/edit.vue

@@ -1,51 +1,53 @@
 <template>
   <div>
     <el-button size="mini" :type="btnType?btnType:'text'" @click="onShow">编 辑</el-button>
-    <el-dialog title="编 辑" :visible.sync="dialogFormVisible">
-      <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
-          <el-col :span="24">
-            <el-form-item label="企业名称" prop="enterprisename">
-              <el-input v-model="form.enterprisename" placeholder="输入企业名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="联系人" prop="contact">
-              <el-input v-model="form.contact" placeholder="输入企业联系人"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="7">
-            <el-form-item label="联系电话" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="输入联系电话"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="税号" prop="taxno">
-              <el-input v-model="form.taxno" placeholder="输入税号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="14">
-            <el-form-item label="省市县" prop="value">
-              <el-cascader
-                style="width:100%"
-                v-model="form.value"
-                :options="basicData.data().areaData"
-                @change="cascaderChange" clearable>
-              </el-cascader>
-            </el-form-item>
-          </el-col>
-          <el-col :span="14">
-            <el-form-item label="详细地址" prop="address">
-              <el-input v-model="form.address" type="textarea" :rows="3" placeholder="输入详细地址"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-      <div class="dialog-footer">
+    <el-drawer title="编辑档案" direction="rtl" append-to-body :visible.sync="dialogFormVisible">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
+            <el-col :span="24">
+              <el-form-item label="企业名称" prop="enterprisename">
+                <el-input v-model="form.enterprisename" placeholder="输入企业名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系人" prop="contact">
+                <el-input v-model="form.contact" placeholder="输入企业联系人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系电话" prop="phonenumber">
+                <el-input v-model="form.phonenumber" placeholder="输入联系电话"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="省市县" prop="value">
+                <el-cascader
+                  style="width:100%"
+                  v-model="form.value"
+                  :options="basicData.data().areaData"
+                  @change="cascaderChange" clearable>
+                </el-cascader>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="税号" prop="taxno">
+                <el-input v-model="form.taxno" placeholder="输入税号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="详细地址" prop="address">
+                <el-input v-model="form.address" type="textarea" :rows="3" placeholder="输入详细地址"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
         <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
   </div>
 </template>
 

src/Form/marketing2/agent/add.vue

@@ -1,7 +1,8 @@
 <template>
   <div>
     <el-button type="primary" size="small" @click="onShow">新 建</el-button>
-    <el-dialog title="创建经销商" append-to-body :visible.sync="dialogVisible">
+    <el-drawer title="创建经销商" direction="rtl" append-to-body :visible.sync="dialogVisible">
+      <div class="drawer__panel">
       <el-row :gutter="20">
         <el-form :model="form" ref="form" :rules="rules" :status-icon="false"	 size="small" label-position="right" label-width="100px" class="demo-form-inline">
           <el-col :span="24">
@@ -98,11 +99,12 @@
           </el-col>
         </el-form>
       </el-row>
-      <div class="dialog-footer">
+      </div>
+      <div class="fixed__btn__panel">
         <el-button size="small" @click="dialogVisible = false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
   </div>
 </template>
 

src/Form/marketing2/agent/edit.vue

@@ -1,121 +1,123 @@
 <template>
   <div>
     <el-button :type="btnType" size="mini" @click="onShow">编 辑</el-button>
-    <el-dialog title="创建经销商" append-to-body :visible.sync="dialogVisible">
-      <el-row :gutter="20">
-        <el-form :model="form" ref="form" :rules="rules" size="small" label-position="right" label-width="100px" class="demo-form-inline">
-          <el-col :span="24">
-            <p class="normal-title normal-margin">企业信息</p>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="企业名称" prop="enterprisename">
-              <el-popover
-                placement="bottom"
-                width="100%"
-                v-model="visible">
-                <div>
-                  <ul class="enterprisePanel">
-                    <li v-for="item in ENlist" :key="item.sys_enterpriseid" @click="chooseEnterprise(item)">
-                      <p>{{item.enterprisename}}</p>
-                      <small>{{item.province}}-{{item.city}}-{{item.county}}</small>
-                    </li>
-                  </ul>
-                </div>
-                <el-input readonly slot="reference" v-model="form.enterprisename" @focus="queryEnterpriseArchives" @input.native="onChange"  placeholder="输入企业名称" clearable></el-input>
-              </el-popover>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="省市县">
-              <p class="enterpriseText">{{enterprise.province?enterprise.province:'--'}}</p>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系人">
-              <p class="enterpriseText">{{enterprise.contact?enterprise.contact:'--'}}</p>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系方式">
-              <p class="enterpriseText">{{enterprise.phonenumber?enterprise.phonenumber:'--'}}</p>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="详细地址">
-              <p class="enterpriseText">{{enterprise.address?enterprise.address:'--'}}</p>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <p class="normal-title normal-margin">经销商信息</p>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="经销商编号" prop="agentnum">
-              <el-input v-model="form.agentnum" placeholder="输入经销商编号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="签约日期">
-              <el-date-picker
-                style="width:100%"
-                v-model="form.signdate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="经销商类型" prop="type">
-              <el-select style="width:100%" v-model="form.type" placeholder="请选择">
-                <el-option
-                  v-for="item in agent_type"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="上级经销商">
-              <selectAgent ref="agent" @selectAgent="selectAgent"></selectAgent>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="经销商等级">
-              <el-select style="width:100%" v-model="form.grade" placeholder="请选择">
-                <el-option
-                  v-for="item in agent_level"
-                  :key="item.value"
-                  :label="item.remarks"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="营销区域" prop="sa_saleareaids">
-              <el-cascader
-                style="width:100%"
-                v-model="form.sa_saleareaids"
-                :options="arealist"
-                :props="{
-                  value:'sa_saleareaid',
-                  label:'areaname',
-                  children:'subarea'
-                }"
-                :show-all-levels="false"
-                @change="onCascaderChange">
-              </el-cascader>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-      <div class="dialog-footer">
+    <el-drawer title="编辑经销商" direction="rtl" append-to-body :visible.sync="dialogVisible">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" ref="form" :rules="rules" size="small" label-position="right" label-width="100px" class="demo-form-inline">
+            <el-col :span="24">
+              <p class="normal-title normal-margin">企业信息</p>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="企业名称" prop="enterprisename">
+                <el-popover
+                  placement="bottom"
+                  width="100%"
+                  v-model="visible">
+                  <div>
+                    <ul class="enterprisePanel">
+                      <li v-for="item in ENlist" :key="item.sys_enterpriseid" @click="chooseEnterprise(item)">
+                        <p>{{item.enterprisename}}</p>
+                        <small>{{item.province}}-{{item.city}}-{{item.county}}</small>
+                      </li>
+                    </ul>
+                  </div>
+                  <el-input readonly slot="reference" v-model="form.enterprisename" @focus="queryEnterpriseArchives" @input.native="onChange"  placeholder="输入企业名称" clearable></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="省市县">
+                <p class="enterpriseText">{{enterprise.province?enterprise.province:'--'}}</p>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系人">
+                <p class="enterpriseText">{{enterprise.contact?enterprise.contact:'--'}}</p>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系方式">
+                <p class="enterpriseText">{{enterprise.phonenumber?enterprise.phonenumber:'--'}}</p>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="详细地址">
+                <p class="enterpriseText">{{enterprise.address?enterprise.address:'--'}}</p>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <p class="normal-title normal-margin">经销商信息</p>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="经销商编号" prop="agentnum">
+                <el-input v-model="form.agentnum" placeholder="输入经销商编号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="签约日期">
+                <el-date-picker
+                  style="width:100%"
+                  v-model="form.signdate"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="经销商类型" prop="type">
+                <el-select style="width:100%" v-model="form.type" placeholder="请选择">
+                  <el-option
+                    v-for="item in agent_type"
+                    :key="item.value"
+                    :label="item.value"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="上级经销商">
+                <selectAgent ref="agent" @selectAgent="selectAgent"></selectAgent>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="经销商等级">
+                <el-select style="width:100%" v-model="form.grade" placeholder="请选择">
+                  <el-option
+                    v-for="item in agent_level"
+                    :key="item.value"
+                    :label="item.remarks"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="营销区域" prop="sa_saleareaids">
+                <el-cascader
+                  style="width:100%"
+                  v-model="form.sa_saleareaids"
+                  :options="arealist"
+                  :props="{
+                    value:'sa_saleareaid',
+                    label:'areaname',
+                    children:'subarea'
+                  }"
+                  :show-all-levels="false"
+                  @change="onCascaderChange">
+                </el-cascader>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
         <el-button size="small" @click="dialogVisible = false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
   </div>
 </template>
 
@@ -296,6 +298,5 @@ export default {
 .enterpriseText{
   height: 34px;
   line-height: 34px;
-  font-weight: 500;
 }
 </style>

src/HManagement/marketing2/agent/details/index.vue

@@ -19,23 +19,23 @@
     <div slot="customOperation">
       <!-- 此区域提供了自定义操作按钮 -->
     </div>
-    <div slot="slot0" class="container normal-panel">
+    <div slot="slot0">
       <el-button size="small" type="primary" @click="createAgentAccount" class="normal-margin">创建经销商主账号</el-button>
       <tableLayout :layout="tablecols" :data="mainData.hrs" :custom="false" height="calc(100vh - 455px)"></tableLayout>
     </div>
-    <div slot="slot1" class="container normal-panel">
+    <div slot="slot1">
       <salescope :data="mainData"></salescope>
     </div>
-    <div slot="slot2" class="container normal-panel">
+    <div slot="slot2">
       <SaleClass :data="mainData"></SaleClass>
     </div>
-    <div slot="slot3" class="container normal-panel">
+    <div slot="slot3">
       <accountMoney :mainData="mainData"></accountMoney>
     </div>
-    <div slot="slot4" class="container normal-panel">
+    <div slot="slot4">
       <agent-address :mainData="mainData"></agent-address>
     </div>
-    <div slot="slot5" class="container normal-panel">
+    <div slot="slot5">
       <agent-contact :mainData="mainData"></agent-contact>
     </div>
   </basicDetails>

src/components/newLayout/index.vue

@@ -11,7 +11,7 @@
           </div>
         </div>
       </div>
-      <navTemp @getModules="getModules"></navTemp>
+      <navTemp  @getModules="getModules"></navTemp>
     </div>
   </div>
 </template>

src/components/newLayout/modules/aside.vue

@@ -110,7 +110,7 @@ export default {
 
       this.$store.dispatch('setActiveApp',{name:app.systemappname,app:at_app,val:''})
 
-      this.$router.replace({path:at_app.path})
+      this.$router.push({path:at_app.path})
     },
     async deleteMenuApp (item) {
       const res = await this.$api.requested({

src/components/newLayout/modules/menu.vue

@@ -33,7 +33,7 @@ export default {
       if (type === 'system') {
         this.setActiveModules(mod[0],mod[0].apps[0])
         let inactivePath = mod[0].apps[0].path
-        this.$router.replace({path:inactivePath})
+        this.$router.push({path:inactivePath})
       }
       
     },

src/components/newLayout/modules/navRight.vue

@@ -77,7 +77,6 @@ export default {
   position:relative;
   right:0;
   top:0;
-  width: 60px;
   height:100%;
   background:rgba(0, 0,0,.3);z-index:9999;
 }

src/components/normal-basic-layout/index.vue

@@ -210,7 +210,6 @@ export default {
     showAppCollection () {
       
 			let _isSame = this.menuApp.some(m=>this.acitveApp.name === m.systemapp)
-      console.log(this.menuApp,_isSame,this.acitveApp.name)
 			return _isSame
 		},
   },