代码上传

src/HDrpManagement/contractManage/components/addContract.vue

@@ -83,13 +83,13 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目名称:" prop="sa_projectid">
+              <el-form-item label="项目名称:" prop="projectname">
                 <el-popover
                   placement="bottom"
                   trigger="manual"
                   v-model="projectVisible"
                   width="600">
-                  <seleteProject ref="project" tag="经销" @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
+                  <seleteProject ref="project" type="2" @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
                   <el-input readonly type="text" slot="reference" size="small" @focus="projectVisible=true;salerVisible = false;agentVisible=false" v-model="form.projectname"></el-input>
                 </el-popover>
               </el-form-item>
@@ -153,13 +153,13 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目名称:" prop="sa_projectid">
+              <el-form-item label="项目名称:" prop="projectname">
                 <el-popover
                   placement="bottom"
                   trigger="manual"
                   v-model="projectVisible"
                   width="600">
-                  <seleteProject ref="project" tag="直销" @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
+                  <seleteProject ref="project" type="1" @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
                   <el-input readonly type="text" slot="reference" size="small" @focus="projectVisible=true;salerVisible = false;agentVisible=false;accountVisible=false" v-model="form.projectname"></el-input>
                 </el-popover>
               </el-form-item>
@@ -281,13 +281,13 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目名称:" prop="sa_projectid">
+              <el-form-item label="项目名称:" prop="projectname">
                 <el-popover
                   placement="bottom"
                   trigger="manual"
                   v-model="projectVisible"
                   width="600">
-                  <seleteProject ref="project" @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
+                  <seleteProject ref="project" type="3" @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
                   <el-input readonly type="text" slot="reference" size="small" @focus="projectVisible=true;salerVisible = false;agentVisible=false;accountVisible=false" v-model="form.projectname"></el-input>
                 </el-popover>
               </el-form-item>
@@ -399,7 +399,7 @@ export default {
         begdate: [
           { required: true, message: '请选择生效日期', trigger: 'blur' },
         ],
-        sa_projectid: [
+        projectname: [
           { required: true, message: '请选择项目', trigger: 'change' },
         ],
         salername: [
@@ -464,10 +464,12 @@ export default {
   watch: {
     DrawerShow (val) {
       if (!val) {
+        console.log('触发清空');
+        
         this.$refs.form.resetFields()
       } else {
         if(this.$refs.project) {
-          this.$refs.project.params.content.where.tag = this.$route.query.type == '经销项目' ? '经销' : '直销'
+          this.$refs.project.params.content.type = this.$route.query.type == '经销项目' ? '2' : '1'
           this.$refs.project.queryEnterpriseArchives()
         }
       }

src/HDrpManagement/contractManage/components/contractClause/contractClause.vue

@@ -4,7 +4,9 @@
       <div class="flex-align-center" style="margin-bottom:10px">
         <el-input size="small" style="width:200px;margin-right:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
         <slot name="addProduct"/>
-        <slot name="reset" />
+        <el-popconfirm title="确定重置当前合同吗？" @confirm="reset()">
+          <el-button size="small" slot="reference" class="inline-16" :disabled="disabled" v-if="tool.checkAuth($route.name,'resetClause')">重 置</el-button>
+        </el-popconfirm>
       </div>
       <tableLayout :layout="tablecols" :data="list" :opwidth="200" :width="false" height="calc(100vh - 550px)" :custom="true" fixedName="operation" >
         <template v-slot:customcol="scope">
@@ -38,6 +40,7 @@
 
 <script>
 export default {
+  props:['disabled'],
   components: {},
   name: '',
   data() {
@@ -82,6 +85,17 @@ export default {
     },
     handleChange(num) {
     },
+    async reset () {
+      let res = await this.$api.requested({
+        "id": 20221128161602,
+        "content": {
+            "sa_contractid":this.$route.query.id
+        },
+      })
+      this.tool.showMessage(res,() => {
+        this.listData()
+      })
+    },
     async save (data) {
       let res = await this.$api.requested({
           "id": 20221128144502,

src/HDrpManagement/contractManage/components/productList/addProduct.vue

@@ -21,7 +21,7 @@
               {{scope.column.data[scope.column.columnname][0].brandname}}
             </div>
             <div v-else>{{scope.column.data[scope.column.columnname]}}</div>
-            <span v-if="!scope.column.data[scope.column.columnname]">--</span>
+            <span v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] != 0">--</span>
           </template>
         </Table>
         <div class="container normal-panel" style="text-align:right">

src/HDrpManagement/contractManage/components/seleteProject.vue

@@ -54,7 +54,7 @@
 
 <script>
 export default {
-  props:['tag'],
+  props:['tag','type'],
   data () {
     return {
       ENlist:[],
@@ -62,19 +62,13 @@ export default {
       currentPage:0,
       form:{},
       params:{
-        "id": 20221020143502,
+        "id": 20221201090802,
         "content": {
           "pageNumber": 1,
           "pageSize": 20,
-          "type":0, //  1：我负责的；2：我参与的；3：我下属负责的；4：我下属参与的
+          "type":this.type,
           "where": {
               "condition": "",
-              "startdate": "",
-              "enddate": "",
-              "status":"",//跟进中、已成交、已失败
-              "projecttype":"",
-              "stagename":"",
-              "tag":''
           }
         },
       },
@@ -83,6 +77,7 @@ export default {
   },
   methods:{
     async queryEnterpriseArchives () {
+      this.params.content.type = this.type
       const res = await this.$api.requested(this.params)
       this.ENlist = res.data
       this.total = res.total

src/HDrpManagement/contractManage/modules/detail.vue

@@ -91,18 +91,16 @@
           </template>
         </productClassList>
         <!--合同条款-->
-        <contractClause ref="Claus" v-if="mainData.type == '项目' || mainData.type == '工具借用'">
+        <contractClause :disabled="mainData.status != '新建' || !isLeader" ref="Claus" v-if="mainData.type == '项目' || mainData.type == '工具借用'">
           <el-button 
             v-if="tool.checkAuth($route.name,'addClaus')"
             size="small" 
             type="primary" 
             slot="addProduct" 
+            class="inline-16"
             @click="$refs.Claus.list.unshift({content:'',sa_contract_clauseid:0}),$refs.Claus.editIndex=0,$refs.Claus.form.sa_contract_clauseid=0"
             :disabled="mainData.status != '新建' || !isLeader" 
           >添 加</el-button>
-          
-          <el-button size="small" slot="reset" class="inline-16" :disabled="mainData.status != '新建' || !isLeader"  @click="reset" v-if="tool.checkAuth($route.name,'resetClause')">重 置</el-button>
-
           <template v-slot:edit="scope">
             <el-button 
               v-if="tool.checkAuth($route.name,'update')"
@@ -511,17 +509,6 @@ export default {
       this.modelList = res.data
       console.log(this.modelList);
     },
-    async reset () {
-      let res = await this.$api.requested({
-        "id": 20221128161602,
-        "content": {
-            "sa_contractid":this.$route.query.id
-        },
-      })
-      this.tool.showMessage(res,() => {
-        this.$refs.Claus.listData()
-      })
-    }
   },
   mounted () {
     this.queryMainData(this.$route.query.id)

src/HDrpManagement/productMoneyOdd/modules/productOddDetail.vue

@@ -37,7 +37,7 @@
         <p>{{scope.column.data[scope.column.columnname]}}</p>
       </template>
       <template v-slot:opreation="scope">
-        <editPrice v-if="tool.checkAuth($route.name,'update')" class="inline-16" :data="scope.data"/>
+        <editPrice v-if="tool.checkAuth($route.name,'update')" class="inline-16" @onSuccess="getDetailList" :data="scope.data"/>
         <delete-btn 
           @deleteCreate="deleteCreate" 
           v-if="tool.checkAuth($route.name,'delete')" 

src/HManagement/notice/list/modules/edit.vue

@@ -202,6 +202,21 @@ export default {
       drawer:false
     }
   },
+  watch: {
+    drawer (val) {
+      if(!val) {
+        this.save =false
+        this.edit = true
+      }
+    },
+    edit (val) {
+      if(val) {
+        this.$store.dispatch('pageOnlyRead',true)
+      } else {
+        this.$store.dispatch('pageOnlyRead',false)
+      }
+    }
+  },
   methods: {
     onUploadSuccess() {
       this.form.status !== '新建' ? this.queryNoticeMain() : this.onSubmit()
@@ -216,6 +231,8 @@ export default {
           "content": this.form
         })
         this.tool.showMessage(res,() => {
+          this.edit = true
+          this.save = false
           this.insertCoursewareauth()
           this.queryNoticeMain()
           this.$emit("updateSuccess")
@@ -243,6 +260,11 @@ export default {
       })
       this.form = Object.assign({}, this.form, res.data)
       this.form.status !== '新建'?this.$store.dispatch('pageOnlyRead',true):this.$store.dispatch('pageOnlyRead',false)
+      if(!this.save) {
+        this.$store.dispatch('pageOnlyRead',true)
+      } else {
+        this.$store.dispatch('pageOnlyRead',false)
+      }
       this.queryFileLink()
       this.queryNoticeClass()
       console.log("获取通告详细数据")

src/HManagement/submit/list/modules/submit_add.vue

@@ -224,6 +224,7 @@ export default {
       if (this.form.istextrequired === 1) { this.form.type.push('文字提报') }
 
       this.form.status !== '新建' ? store.state.pageOnlyRead = true : store.state.pageOnlyRead = false
+      
     },
     onSubmit() {
       this.$refs['form'].validate(async (valid) => {
@@ -234,8 +235,7 @@ export default {
           "id":20221102093702,
           "content": this.form
         })
-        this.insertCoursewareauth()
-
+        this.insertCoursewareauth(res.data)
         this.$store.dispatch('DrawerShowChange',false)
         this.$router.go(-1)
       })
@@ -252,9 +252,11 @@ export default {
       console.log(this.authData)
     },
     // 新增授权范围
-    async insertCoursewareauth() {
+    async insertCoursewareauth(data) {
       console.log("新增授权查询")
-      console.log(this.authData)
+      this.authData.sat_submiteditmodelid = data.sat_submiteditmodelid
+      console.log(this.authData);
+      
       const res = await this.$api.requested({
         /*"classname": "webmanage.saletool.submitedit.submiteditauth",
         "method": "insertOrUpdate",*/
@@ -316,6 +318,7 @@ export default {
   created() {
     console.log("输出")
     console.log(this.$route.query.id)
+    this.$store.dispatch('pageOnlyRead',false)
     /*this.drawer = true*/
     /*this.querySubmitMain()
     this.query_auth()*/

src/HManagement/submit/list/modules/submit_edit.vue

@@ -8,9 +8,10 @@
         direction="rtl"
         size="90%"
         append-to-body
+        v-if="status"
         @close="onClose">
       <div class="detail__panel">
-        <div class="container sticky">
+        <div class="container normal-panel sticky">
           <!--          <el-button v-show="save"  type="warning" size="small"  @click="onSubmit()" >保 存</el-button>-->
           <el-button class="inline-16" v-if="tool.checkAuth($route.name,'update')" :disabled="form.status == '发布'"  type="primary" size="small"  @click="onEdit()" >编 辑</el-button>
           <release class="inline-16" v-if="edit" :data="form" @onSuccess="onSuccess"></release>
@@ -79,7 +80,7 @@
               </div>
             </el-col>
             <el-col :span="11" :onlyread="store.state.pageOnlyRead">
-              <scopeOfauth :defaultData="defaultData" :disabled="form.status == '发布'" appidname="sat_submiteditmodelid" obiectName="sat_submiteditmodel" :dataid="$route.query.id"
+              <scopeOfauth v-if="defaultData" :defaultData="defaultData" :disabled="!save" appidname="sat_submiteditmodelid" obiectName="sat_submiteditmodel" :dataid="$route.query.id"
                            @onChecked="onChecked"></scopeOfauth>
             </el-col>
           </el-row>
@@ -141,13 +142,21 @@ export default {
           }
         }
     return {
+      authData: {
+        departmentid: [],
+        hrid: [],
+        isonlymanager_agent: false,
+        isonlymanager_dept: false,
+        sa_agentsid: [],
+        sat_submiteditmodelid: '',
+      },
       store,
       drawer:false,
       edit:true,
       save:false,
       status:false,
       folderid: JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
-      defaultData: {},
+      defaultData: '',
       rules: {
         title: [
           { required: true, message: '请输入课程名称', trigger: 'blur' },
@@ -177,6 +186,21 @@ export default {
         "begdate": "",
         "enddate": "",
         "type": []
+      },
+    }
+  },
+  watch: {
+    drawer (val) {
+      if(!val) {
+        this.save =false
+        this.edit = true
+      }
+    },
+    edit (val) {
+      if(val) {
+        this.$store.dispatch('pageOnlyRead',true)
+      } else {
+        this.$store.dispatch('pageOnlyRead',false)
       }
     }
   },
@@ -196,6 +220,13 @@ export default {
       if (this.form.istextrequired === 1) { this.form.type.push('文字提报') }
 
       this.form.status !== '新建' ? store.state.pageOnlyRead = true : store.state.pageOnlyRead = false
+
+      if(!this.save) {
+        this.$store.dispatch('pageOnlyRead',true)
+      } else {
+        this.$store.dispatch('pageOnlyRead',false)
+      }
+
       this.status = true
     },
     onSubmit() {
@@ -205,7 +236,8 @@ export default {
           "id":20221102093702,
           "content": this.form
         })
-        this.insertCoursewareauth()
+        this.edit = true
+        this.insertCoursewareauth(res.data)
         this.drawer = false
         this.$emit("updateSuccess")
       })
@@ -221,7 +253,12 @@ export default {
       console.log(this.authData)
     },
     // 新增授权范围
-    async insertCoursewareauth() {
+    async insertCoursewareauth(data) {
+      this.authData.sat_submiteditmodelid = data.sat_submiteditmodelid
+      if (this.authData.departmentid.length == 0) this.authData.departmentid = this.defaultData.departmentid
+      if (this.authData.hrid.length == 0) this.authData.hrid = this.defaultData.hrid
+      if (this.authData.sa_agentsid.length == 0) this.authData.sa_agentsid = this.defaultData.sa_agentsid
+      if (this.authData.sa_saleareaid.length == 0) this.authData.sa_saleareaid = this.defaultData.sa_saleareaid.departmentid
       const res = await this.$api.requested({
         "id":"20221102094302",
         "content": this.authData
@@ -242,6 +279,8 @@ export default {
         }
       })
       this.defaultData = res.data
+      console.log(this.defaultData);
+      
     },
     onshow(){
       this.$router.replace({path:'submit_mag',query:{id:this.id}})

src/SManagement/submitedit_details/components/SubmiteditAction.vue

@@ -32,7 +32,7 @@ export default {
   data() {
     return {
       param: {
-        "classname": "saletool.submitedit.submitedit",
+        "id":20221102095102,
         "method": "insertorupdate",
         "content": {
           "sat_submiteditmodelid": "",
@@ -118,8 +118,7 @@ export default {
               }
             }
             this.$api.requested({
-              "classname": "saletool.submitedit.submitedit",
-              "method": "sub_submitdetailed",
+              "id":20221102095302,
               "content": {
                 "onceonly": this.$route.query.type == 'more' ? 1 : 0,
                 "sat_submiteditmodelid": res.data.sat_submiteditmodelid,
@@ -143,8 +142,7 @@ export default {
         this.tool.showMessage(res, async () => {
           //提交提报明细
           let param2 = {
-            "classname": "saletool.submitedit.submitedit",
-            "method": "sub_submitdetailed",
+            id:"20221102095302",
             "content": {
               "onceonly": this.$route.query.type == 'more' ? 1 : 0,
               "sat_submiteditmodelid": this.detailData.sat_submiteditmodelid,

src/SManagement/submitedit_details/components/SubmiteditItemInfo.vue

@@ -97,7 +97,7 @@ export default {
   height: 100%;
 }
 .normal-card {
-  min-height: calc(100vh - 310px);
+  min-height: calc(100vh - 190px);
   position: relative;
 }
 /deep/.el-drawer__header {

src/SManagement/submitedit_details/index.vue

@@ -45,8 +45,7 @@ export default {
   data() {
     return {
       param: {
-          "classname": "saletool.submitedit.submitedit",
-          "method": "select_submitdetailed",
+          "id":20221102095002,
           "content": {
               "nochche":true,
               "sat_submiteditmodelid":""
@@ -99,8 +98,7 @@ export default {
       this.detailData.submitedit.forEach( async element => {
         if(element.status == '未提报') {
           let param = {
-              "classname": "saletool.submitedit.submitedit",
-              "method": "delete_submitdetailed",
+              "id":20221102095202,
               "content": {
                   "sat_submiteditid":element.sat_submiteditid
               }
@@ -135,7 +133,6 @@ export default {
     min-height: calc(100vh - 136px);
   }
   .index .normal-card {
-    margin-bottom: 10px;
   }
   .index .normal-card:nth-child(1) {
     display: flex;

src/SManagement/submitedit_more/index.vue

@@ -1,14 +1,33 @@
 <template>
-  <div class="normal-card">
-    <time-select @timeChange="timeChange" @clearSelect="clearSelect" v-if="tool.checkAuth($route.name,'read')"></time-select>
-    <list :list="oneData" type="more" v-if="tool.checkAuth($route.name,'read')"></list>
-    <!--分页-->
-    <pagination :total="total" :pageSize="param.content.pageSize" :currentPage="param.content.pageNumber" @pageChange="pageChange">
-    </pagination>
-  </div>
+<div>
+  <el-drawer
+      title="我是标题"
+      :visible.sync="drawer"
+      :with-header="false"
+      direction="rtl"
+      size="90%"
+      append-to-body
+      @close="closeDrawer">
+      <div>
+        <router-view/>
+      </div>
+    </el-drawer>
+    <normalLayout class="normal-card" @onRefresh="getSubmitEditAction">
+    <div slot="content" class="container">
+      <time-select @timeChange="timeChange" @clearSelect="clearSelect" v-if="tool.checkAuth($route.name,'read')"></time-select>
+      <list :list="oneData" type="more" v-if="tool.checkAuth($route.name,'read')"></list>
+      <!--分页-->
+      <pagination :total="total" :pageSize="param.content.pageSize" :currentPage="param.content.pageNumber" @pageChange="pageChange">
+      </pagination>
+    </div>
+  </normalLayout>
+</div>
+
 </template>
 
 <script>
+import {mapGetters} from 'vuex'
+
 import Pagination from '@/components/pagination/Pagination'
 import SelectPanl from '@/SManagement/submitedit_one/components/SelectPanl'
 import TimeSelect from '@/SManagement/submitedit_one/components/TimeSelect'
@@ -19,8 +38,7 @@ export default {
   data () {
     return {
       param: {
-          "classname": "saletool.submitedit.submitedit",
-          "method": "select_submitlist",
+          "id":20221102094702,
           "content": {
               "nocache":true,
               "onceonly":0,
@@ -34,6 +52,7 @@ export default {
       },
       oneData:[],
       total: 0,
+      drawer:false
     }
   },
   components: {
@@ -43,13 +62,28 @@ export default {
     TimeSelect
   },
   computed: {
+    ...mapGetters({
+      DrawerShow:'DrawerShow'
+    })
   },
   watch: {
+    $route (val) {
+      if (val.path == '/submitedit_more') {
+        this.getSubmitEditAction()
+      }
+    },
+    DrawerShow (val) {
+      val ? this.drawer = true : this.drawer = false
+    }
   },
   created () {
     this.getSubmitEditAction()
   },
   methods: {
+    closeDrawer () {
+      this.$store.dispatch('DrawerShowChange',false)
+      this.$router.back()
+    },
     //获取所有一事一报
     async getSubmitEditAction () {
       let res = await this.$api.requested(this.param)
@@ -80,9 +114,12 @@ export default {
 * {
   box-sizing: border-box;
 }
+.container {
+  min-height: calc(100vh - 200px);
+}
 .normal-card {
   min-height: calc(100vh - 136px);
-  padding: 18px 20px 30px 10px;
+  padding: 0 20px 30px 10px;
   position: relative;
 }
 .el-pagination {

src/SManagement/submitedit_one/components/list.vue

@@ -46,8 +46,9 @@ export default {
     itemClick (id, history) {
       window.sessionStorage.setItem('currentPath', this.$route.path)
       window.sessionStorage.setItem('history', history)
+      this.$store.dispatch('DrawerShowChange',true)
       this.$router.push({
-        path: '/submiteditmag_detail',
+        path: this.type == 'more' ? '/submiteditmag_detail' : 'submiteditmag_detail_one',
         query: {
           id: id,
           type: this.type

src/SManagement/submitedit_one/index.vue

@@ -1,16 +1,33 @@
 <template>
-<normalLayout @onRefresh="getSubmitEditAction">
-  <div class="container" slot="content">
-    <time-select @timeChange="timeChange" @clearSelect="clearSelect" v-if="tool.checkAuth($route.name,'read')"></time-select>
-    <list :list="oneData" v-if="tool.checkAuth($route.name,'read')"></list>
-    <!--分页-->
-    <pagination :total="total" :pageSize="param.content.pageSize" :currentPage="param.content.pageNumber" @pageChange="pageChange">
-    </pagination>
-  </div>
-</normalLayout>
+<div>
+  <normalLayout class="normal-card" @onRefresh="getSubmitEditAction">
+    <div class="container" slot="content">
+      <time-select @timeChange="timeChange" @clearSelect="clearSelect" v-if="tool.checkAuth($route.name,'read')"></time-select>
+      <list :list="oneData" v-if="tool.checkAuth($route.name,'read')"></list>
+      <!--分页-->
+      <pagination :total="total" :pageSize="param.content.pageSize" :currentPage="param.content.pageNumber" @pageChange="pageChange">
+      </pagination>
+    </div>
+  </normalLayout>
+  <el-drawer
+      title="我是标题"
+      :visible.sync="drawer"
+      :with-header="false"
+      direction="rtl"
+      size="90%"
+      append-to-body
+      @close="closeDrawer">
+      <div>
+        <router-view/>
+      </div>
+    </el-drawer>
+</div>
+
 </template>
 
 <script>
+import {mapGetters} from 'vuex'
+
 import Pagination from '@/components/pagination/Pagination'
 import SelectPanl from '@/SManagement/submitedit_one/components/SelectPanl'
 import TimeSelect from '@/SManagement/submitedit_one/components/TimeSelect'
@@ -22,8 +39,7 @@ export default {
   data () {
     return {
       param: {
-          "classname": "saletool.submitedit.submitedit",
-          "method": "select_submitlist",
+          "id":20221102094702,
           "content": {
               "nocache":true,
               "onceonly":1,
@@ -37,6 +53,7 @@ export default {
       },
       oneData:[],
       total: 0,
+      drawer:false
     }
   },
   components: {
@@ -46,17 +63,34 @@ export default {
     TimeSelect
   },
   computed: {
+    ...mapGetters({
+      DrawerShow:'DrawerShow'
+    })
   },
   watch: {
+    $route (val) {
+      if (val.path == '/submitedit_one') {
+        this.getSubmitEditAction()
+      }
+    },
+    DrawerShow (val) {
+      val ? this.drawer = true : this.drawer = false
+    }
   },
   created () {
     this.getSubmitEditAction()
   },
   methods: {
+    closeDrawer () {
+      this.$store.dispatch('DrawerShowChange',false)
+      this.$router.back()
+    },
     //获取所有一事一报
     async getSubmitEditAction () {
       let res = await this.$api.requested(this.param)
       this.oneData = res.data
+      console.log(res);
+      
       this.total = res.total
       console.log(this.oneData);
       
@@ -87,9 +121,12 @@ export default {
 }
 .normal-card {
   min-height: calc(100vh - 136px);
-  padding: 18px 20px 30px 10px;
+  padding: 0 20px 30px 10px;
   position: relative;
 }
+.container {
+  min-height: calc(100vh - 210px);
+}
 .el-pagination {
   position: absolute;
   right: 16px;

src/components/scopeOfAuthority/modules/dep_auth.vue

@@ -90,7 +90,9 @@ export default {
       })
       // 数据格式转换成elementui-tree所需的格式
       this.responseData = res.data
-      this.deplist = this.createMenu(res.data)      
+      this.deplist = this.createMenu(res.data)    
+      console.log(this.deplist,'树');
+        
       this.$emit('onClick',{data:this.deplist[0],parent:[]})
 
       // 如果存在默认组织数据就执行
@@ -230,11 +232,20 @@ export default {
     }, 1000);
   },
   watch:{
-    defaultData (val) {
-      this.departmentids = val.departmentid
-      this.checkedMenbers = val.hrid
-      this.isonlymanager_dept = val.isonlymanager_dept
-      this.$refs.tree.setCheckedKeys(val.departmentid)
+    defaultData: {
+      handler (val) {
+        this.$nextTick(() => {
+          this.departmentids = val.departmentid
+          this.checkedMenbers = val.hrid
+          this.isonlymanager_dept = val.isonlymanager_dept
+          this.$refs.tree.setCheckedKeys(val.departmentid)
+          this.department()
+        })
+      },
+      immediate:true,
+      deep:true
+    },
+    pageOnlyRead( val ) {
       this.department()
     }
   }

src/components/scopeOfAuthority/modules/mar_auth.vue

@@ -228,11 +228,20 @@ export default {
   watch:{
     pageOnlyRead () {
     },
-    defaultData (val) {
-      this.saleareaids = val.sa_saleareaid
-      this.checkedMenbers = val.sa_agentsid
-      this.isonlymanager_agent = val.isonlymanager_agent
-      this.$refs.tree.setCheckedKeys(val.sa_saleareaid)
+    defaultData: {
+      handler (val) {
+        this.$nextTick(() => {
+          this.saleareaids = val.sa_saleareaid
+          this.checkedMenbers = val.sa_agentsid
+          this.isonlymanager_agent = val.isonlymanager_agent
+          this.$refs.tree.setCheckedKeys(val.sa_saleareaid)
+          this.department()
+        })
+      },
+      immediate:true,
+      deep:true
+    },
+    pageOnlyRead( val ) {
       this.department()
     }
   }

src/router/SManagement.js

@@ -79,7 +79,19 @@ const SManagement = [{
     title: '提报',
     ast_nav: true
   },
-  component: () => import(/* webpackChunkName: "about" */ '@/SManagement/submitedit_one/index')
+  component: () => import(/* webpackChunkName: "about" */ '@/SManagement/submitedit_one/index'),
+  children: [
+    {
+      path: '/submiteditmag_detail_one',
+      name: 'submiteditmag',
+      meta: {
+        title: '提报详情',
+        ast_nav: true,
+        keeproute: true
+      },
+      component: () => import(/* webpackChunkName: "about" */ '@/SManagement/submitedit_details/index')
+    }
+  ]
 }, {
   path: '/submitedit_more',
   name: 'submiteditmag',
@@ -87,16 +99,19 @@ const SManagement = [{
     title: '提报',
     ast_nav: true
   },
-  component: () => import(/* webpackChunkName: "about" */ '@/SManagement/submitedit_more/index')
-}, {
-  path: '/submiteditmag_detail',
-  name: 'submiteditmag',
-  meta: {
-    title: '提报详情',
-    ast_nav: true,
-    keeproute: true
-  },
-  component: () => import(/* webpackChunkName: "about" */ '@/SManagement/submitedit_details/index')
+  component: () => import(/* webpackChunkName: "about" */ '@/SManagement/submitedit_more/index'),
+  children: [
+    {
+      path: '/submiteditmag_detail',
+      name: 'submiteditmag',
+      meta: {
+        title: '提报详情',
+        ast_nav: true,
+        keeproute: true
+      },
+      component: () => import(/* webpackChunkName: "about" */ '@/SManagement/submitedit_details/index')
+    }
+  ]
 }, {
   path: '/refresh',
   name: 'refresh',