Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/Form/contractManage/add.vue

@@ -0,0 +1,55 @@
+<template>
+  <div>
+    <el-popover
+    placement="bottom"
+    trigger="hover">
+    <div slot="title">合同类型</div>
+    <div style="display:flex;flex-direction:column">
+      <el-button type="text" size="mini" @click="addBtn">经销商合作协议</el-button>
+      <el-button type="text" size="mini">经销项目协议</el-button>
+      <el-button type="text" size="mini">直销项目协议</el-button>
+      <el-button type="text" size="mini">工具使用协议</el-button>
+      <el-button type="text" size="mini">居间协议</el-button>
+
+    </div>
+    <el-button slot="reference" size="mini" type="primary">新 建</el-button>
+  </el-popover>
+
+  </div>
+</template>
+
+<script>
+export default {
+  components:{},
+  data () {
+    return {
+      form:{
+
+      },
+      arealist:[],
+      rules:{
+        sys_enterpriseid: [
+          { required: true, message: '请选择企业名称', trigger: 'blur' },
+        ],
+      },
+      type:''
+    }
+  },
+  methods:{
+    addBtn () {
+      this.$store.dispatch('changeDetailDrawer',true)
+      this.$router.push('/addContract')
+    }
+  },
+  created() {
+  },
+  mounted () {
+  }
+}
+
+</script>
+<style scoped>
+/deep/.el-select {
+  width: 100%!important;
+}
+</style>

src/Form/contractManage/edit.vue

@@ -0,0 +1,161 @@
+<template>
+  <div>
+    <el-button size="mini" :type="btnType?btnType:'text'" @click="onShow">编 辑</el-button>
+    <el-dialog title="编 辑" append-to-body :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="sys_enterpriseid">
+              <el-select v-model="form.sys_enterpriseid" placeholder="请选择企业" @change="enterpriseChange">
+                <el-option
+                  v-for="item in enterpriseData"
+                  :key="item.sys_enterpriseid"
+                  :label="item.enterprisename"
+                  :value="item.sys_enterpriseid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="账户类型" prop="sa_accountclassid">
+              <el-select v-model="form.sa_accountclassid" placeholder="请选择账户类型">
+                <el-option
+                  v-for="item in accountClassData"
+                  :key="item.sa_accountclassid"
+                  :label="item.accountname"
+                  :value="item.sa_accountclassid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="信用额度" prop="creditquota">
+              <el-input v-model="form.creditquota" placeholder="输入信用额度"></el-input>
+            </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-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>
+  </div>
+</template>
+
+<script>
+import {mapGetters} from 'vuex'
+export default {
+  props:['data','btnType'],
+  data () {
+    return {
+      dialogFormVisible:false,
+      enterpriseData:[],
+      accountClassData:[],
+      form:{
+        sa_creditbillid:0,
+        sys_enterpriseid:'',
+        sa_accountclassid:'',
+        creditquota:'',
+        remarks:''
+      },
+      rules:{
+        sys_enterpriseid: [
+          { required: true, message: '请选择企业名称', trigger: 'blur' },
+        ],
+        sa_accountclassid: [
+          { required: true, message: '请选择账户类型', trigger: 'blur' },
+        ],
+        creditquota: [
+          { required: true, message: '请填写信用额度', trigger: 'change' },
+        ],
+      }
+    }
+  },
+  methods:{
+    /* 获取企业档案 */
+    async getEnterpriseData() {
+      let res = await this.$api.requested({
+        "id": "20221008164103",
+        "version":1,
+        "content": {
+          "where":{
+              "condition":""
+          }
+        }
+      })
+      this.enterpriseData = res.data
+      console.log(this.enterpriseData);
+      
+    },
+    /* 企业选择变化 */
+    async enterpriseChange() {
+      console.log(this.form.sys_enterpriseid);
+      let res = await this.$api.requested({
+        "id": "20221008164203",
+        "version":1,
+        "content": {
+          "sys_enterpriseid":this.form.sys_enterpriseid
+        }
+      })
+      this.form.sa_accountclassid = ''
+      this.accountClassData = res.data
+      console.log(this.accountClassData);
+      
+    },
+    cascaderChange (val) {
+      if (val.length === 1) 
+        return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
+
+      this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
+    },
+    onSubmit () {
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+        "id": "20221008155003",
+        "version":1,
+        "content": this.form
+      })
+        this.tool.showMessage(res,()=>{
+          this.$emit('onSuccess')
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false
+        })
+     })
+    },
+    async onShow () {
+      this.form = Object.assign({},this.form,this.data)
+      console.log(this.form);
+      
+      if( this.data ) {
+        let res = await this.$api.requested({
+          "id": "20221008164203",
+          "version":1,
+          "content": {
+            "sys_enterpriseid":this.form.sys_enterpriseid
+          }
+        })
+        this.accountClassData = res.data
+      }
+      this.dialogFormVisible = true
+    }
+  },
+  created() {
+    this.getEnterpriseData()
+  },
+  mounted () {
+  }
+}
+
+</script>
+<style scoped>
+/deep/.el-select {
+  width: 100% !important;
+}
+</style>

src/HDrpManagement/contractManage/components/addContract.vue

@@ -0,0 +1,107 @@
+<template>
+  <div style="height:100vh">
+    <p class="normal-title normal-panel" style="line-height:32px;padding-left:16px;border-bottom:1px solid #eeeeee">新建合同</p>
+    <div class="header_info">
+      <el-row>
+        <el-form :model="form" :rules="rules" ref="form" label-position="right" label-width="75px" size="small">
+          <el-col :span="6">
+            <el-form-item label="合同编号" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="合同模板" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="经销商" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="项目名称" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="业务员" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="生效日期" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="截止日期" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="签约日期" prop="hrid">
+              <el-input type="text" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="合同描述" prop="hrid">
+              <el-input type="textarea" size="small" v-model="form"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+    </div>
+    <Tabs :tabs="['产品清单','合同条款','业务关联']">
+      <div slot="slot0">1111111111111</div>
+    </Tabs>
+    <div class="fixed__btn__panel">
+      <el-button size="small" class="normal-btn-width">取 消</el-button>
+      <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import Tabs from './tab'
+export default {
+  name: '',
+  components:{Tabs},
+  data () {
+    return {
+      form: {},
+      rules: {
+        sys_enterpriseid: [
+          { required: true, message: '请选择企业名称', trigger: 'blur' },
+        ],
+        sa_accountclassid: [
+          { required: true, message: '请选择账户类型', trigger: 'blur' },
+        ],
+        creditquota: [
+          { required: true, message: '请填写信用额度', trigger: 'change' },
+        ],
+      }
+    };
+  },
+  computed: {
+  },
+  watch: {
+  },
+  methods: {
+    onSubmit () {
+
+    }
+  },
+};
+</script>
+
+<style scoped>
+* {
+  box-sizing: border-box;
+}
+.header_info {
+  background: #ffffff;
+  padding: 16px 16px 0 16px;
+  margin-bottom: 16px;
+}
+</style>

src/HDrpManagement/contractManage/components/tab.vue

@@ -0,0 +1,53 @@
+<template>
+  <div class="normal-panel tab__panel">
+    <div>
+      <el-tabs v-model="activeName">
+        <el-tab-pane v-for="(tab,index) in tabs" :key="index" :label="tab" :name="'tab' + index"></el-tab-pane>
+        <el-tab-pane label="附件" name="file"></el-tab-pane>
+        <el-tab-pane label="操作记录" name="log"></el-tab-pane>
+      </el-tabs>
+    </div>
+
+    <div v-show="'tab'+index === activeName" v-for="(item,index) in tabs" :key="index">
+      <slot v-if="'tab'+index === activeName"  :name="'slot' + index"></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['tabs','editData','ownertable','idname'],
+  components:{
+  },
+  data () {
+    return {
+      activeName:'tab0',
+      attinfo_attachment:[],
+      folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
+    }
+  },
+  methods:{
+  },
+  mounted () {
+    // this.queryAttments()
+  },
+  watch: {
+
+  },
+}
+
+</script>
+<style>
+.tab__panel .el-tabs__item{
+  color:#999
+}
+.tab__panel  .el-tabs__item.is-active {
+  color:#3874f6
+}
+</style>
+<style scoped>
+.tab__panel{
+  padding:0 10px 10px 10px;
+  border-radius:5px;
+}
+</style>

src/HDrpManagement/contractManage/index.vue

@@ -0,0 +1,88 @@
+
+<template>
+  <div>
+    <basicLayout 
+      ref="basicLayout" 
+      formPath="contractManage"
+      tableName="contractListTable" 
+      idName="userid" 
+      :apiId="{query:20221031141102,del:20221031141202}"
+      :options="options"
+      :detailPath="{
+        path:'/account_details'
+      }">
+      <div slot="custom" style="display:flex">
+        <div class="label_center">
+          <p class="search__label">范围:</p>
+          <el-select
+            class="inline-16"
+            size="small"
+            v-model="form.area"
+            placeholder="请选择范围"
+            clearable
+          >
+            <el-option
+              :label="11"
+              :value="111"
+            ></el-option>
+          </el-select>
+        </div>
+        <div class="label_center">
+          <p class="search__label">合同类型:</p>
+          <el-select
+            class="inline-16"
+            size="small"
+            v-model="form.area"
+            placeholder="请选择合同类型"
+            clearable
+          >
+            <el-option
+              :label="11"
+              :value="111"
+            ></el-option>
+          </el-select>
+        </div>
+        <div class="label_center">
+          <p class="search__label">合同状态:</p>
+          <el-select
+            class="inline-16"
+            size="small"
+            v-model="form.area"
+            placeholder="请选择合同状态"
+            clearable
+          >
+            <el-option
+              :label="11"
+              :value="111"
+            ></el-option>
+          </el-select>
+        </div>
+      </div>
+
+      <template v-slot:tbList="scope">
+        <div>
+          {{scope.data.column.data[[scope.data.column.columnname]]}}
+        </div>
+      </template>
+      <template v-slot:tbOpreation="scope">
+      </template>
+    </basicLayout>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      options:[],
+      form:{}
+      
+    }
+  },
+  methods:{
+  }
+}
+
+</script>
+<style>
+</style>

src/HManagement/addressList/mycontact/modules/addContact.vue

@@ -126,6 +126,11 @@ export default {
       ]
     }
   },
+  watch: {
+    dialogFormVisible (val) {
+     !val && this.$refs.form.resetFields()
+    }
+  },
   computed:{
     ...mapGetters({
       sys_options:'sys_options'
@@ -143,7 +148,6 @@ export default {
           "content": this.form
         })
         this.tool.showMessage(res,()=>{
-          this.$refs.form.resetFields()
           this.dialogFormVisible = false
           this.$emit('onAddSuccess')
           this.refresh()

src/HManagement/addressList/mycontact/modules/addGroup.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="container normal-panel">
+  <div>
     <el-button type="primary" size="mini" icon="el-icon-plus" @click="dialogFormVisible = true">新建群组</el-button>
     <el-dialog title="新建群组" append-to-body :visible.sync="dialogFormVisible" width="600px">
       <el-form :model="form" ref="form" label-position="right" label-width="80px" size="small">
@@ -25,6 +25,11 @@ export default {
       form:{}
     }
   },
+  watch: {
+    dialogFormVisible (val) {
+     !val && this.$refs.form.resetFields()
+    }
+  },
   methods:{
     async addGroup () {
       this.$refs['form'].validate(async (valid) => {
@@ -41,7 +46,6 @@ export default {
           setTimeout(() => {
             this.$emit('onSuccess')
           }, 500);
-          this.$refs.form.resetFields()
           this.dialogFormVisible = false
         })
       });

src/HManagement/addressList/mycontact/modules/group.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="normal-panel scroll-panel" style="width:300px">
     <div style="margin-bottom:30px">
-      <div style="display:flex;align-items:center"> 
+      <div style="display:flex;align-items:center;justify-content:space-between"> 
         <p class="container normal-title" style="margin:5px 0">系统群组</p>
-        <slot name="addContact"></slot>
+        <div style="margin-right:16px"><slot name="addContact"></slot></div>
       </div>
       <ul>
         <li @click="clickGroup(item)" v-for="item in sysGroup" :key="item.index" :class="active === item.rowindex?'act':''" class="pd-t-b flex-align-center flex-between">
@@ -18,9 +18,9 @@
       </ul>
     </div>
     <div>
-      <div style="display:flex;align-items:center"> 
-        <p class="normal-title" style="padding-left:16px;width:200px">自定义群组</p>
-        <slot name="addGroup"></slot>
+      <div style="display:flex;align-items:center;justify-content:space-between"> 
+        <p class="container normal-title">自定义群组</p>
+        <div style="margin-right:16px"><slot name="addGroup"></slot></div>
       </div>
       <ul>
         <li @click="clickGroup(item)" v-for="item in myGroup" :key="item.index" :class="active === item.rowindex?'act':''" class="pd-t-b flex-align-center flex-between">

src/HManagement/roleManage/index.vue

@@ -50,6 +50,13 @@ export default {
       type:''
     }
   },
+  watch: {
+    $route(val) {
+      if(val.path == '/role_manage') {
+        this.$refs.basicLayout.listData()
+      }
+    }
+  },
   components:{
   },
   methods:{

src/HManagement/roleManage/modules/role_details.vue

@@ -1,5 +1,6 @@
 <template>
   <div>
+    <!-- delApiId="20221101132002" -->
     <basicDetails
         ref="details"
         :titleText="mainData.rolename"
@@ -7,7 +8,6 @@
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20221101131902"
-        delApiId="20221101132002"
         idname="roleid"
         ownertable="sys_role"
         tags=""
@@ -17,6 +17,9 @@
       <div slot="tags">
       </div>
       <div slot="customOperation" >
+        <el-popconfirm title="确定删除当前角色吗？" @confirm="deleteRow()">
+          <el-button slot="reference" size="mini">删 除</el-button>
+        </el-popconfirm>
       </div>
       <div class="container normal-panel" slot="slot0" >
         <roleContentTemp :data="{roleid:$route.query.id}" @onSuccess="onSuccess">
@@ -112,6 +115,47 @@ export default {
       this.appoptions = row.options
       this.hiddenfields = row.hiddenfields
     },
+    async deleteRow () {
+      let res = await this.$api.requested({
+        "id": 20221121112102,
+        "content": {
+            "roleids": [this.mainData.roleid]
+        },
+      })
+      if (res.data == 2) {
+        this.$confirm('该角色已被使用，删除角色会导致账号失去该角色功能权限，是否确认删除角色？?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        const res = await this.$api.requested({
+          "id":20221101132002,
+          "content": {
+            "roleids":[this.mainData.roleid]
+          }
+        })
+        this.tool.showMessage(res,()=>{
+          this.$store.dispatch('changeDetailDrawer',false)
+        })
+      }).catch((err) => {
+        console.log(err)
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });          
+      });
+      } else {
+        let res = await this.$api.requested({
+          "id":20221101132002,
+          "content": {
+            "roleids":[this.mainData.roleid]
+          }
+        })
+        this.tool.showMessage(res,() => {
+          this.$store.dispatch('changeDetailDrawer',false)
+        })
+      }
+    }
   },
   mounted () {
    // 获取应用表结构

src/HManagement/siteManage/custom_option/index.vue

@@ -34,13 +34,14 @@ import edit from './modules/edit'
 import del_option from './modules/delete'
 import details_list from './modules/detailsList'
 import add from './modules/add'
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   data(){
     return {
       optiontypeid:'',
       disabled:true,
       list:[],
-      classname:''
+      classname:'',
     }
   },
   components:{
@@ -59,12 +60,10 @@ export default {
   methods:{
     onSuccess () {
      this.$refs.list.queryOptions(true)
-     this.$refs.listDetails.detailsList()
+      this.$refs.listDetails.detailsList()
     },
     rowShow(row){
       this.optiontypeid = row.optiontypeid
-      console.log(row,this.optiontypeid,'eeeeee');
-      
       this.disabled = false
       this.list = row
       this.classname = row.remarks

src/HManagement/siteManage/custom_option/modules/add.vue

@@ -51,20 +51,24 @@ export default {
       }
     }
   },
+  watch: {
+    drawer (val) {
+      !val && this.$refs.form.resetFields()
+    }
+  },
   methods:{
     show(){
       this.drawer = true
       console.log("参数")
       console.log(this.data)
     },
-    onSubmit  () {
+    async onSubmit  () {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
         this.form.optiontypeid = this.data.optiontypeid
-        const res = this.$api.requested({ "id": 20220901092601,content:this.form})
+        const res = await this.$api.requested({ "id": 20220901092601,content:this.form})
         this.tool.showMessage(res,()=>{
           this.drawer = false
-          this.$refs.form.resetFields()
           this.$emit('addSuccess')
         })
       });

src/HManagement/siteManage/custom_option/modules/detailsList.vue

@@ -52,7 +52,6 @@ export default {
         "pageSize": 20,
         "id": 20220901092501,
         "content": {
-          "nocache":true,
           "optiontypeid":''
         }
       }
@@ -61,9 +60,7 @@ export default {
   methods:{
     async detailsList(){
       console.log("输出")
-      console.log(this.id)
       this.param.content.optiontypeid = this.id
-      console.log(this.param.content.optiontypeid)
       const res = await this.$api.requested(this.param)
       console.log(res)
       this.list = res.data

src/HManagement/siteManage/custom_option/modules/list.vue

@@ -58,7 +58,12 @@ export default {
       this.total = res.total
       this.currentPage = res.pageNumber
       this.$nextTick(() => {
-        this.$refs.table.$refs.table.setCurrentRow(setRow ? this.currentRow : this.list[0])
+        if(setRow) {
+          if (this.currentRow) {
+            this.currentRow = this.list.find(item => item.optiontypeid == this.currentRow.optiontypeid)
+          }
+          this.$refs.table.$refs.table.setCurrentRow(setRow ? this.currentRow ? this.currentRow : this.list[0] : '')
+        }
       })
       this.$emit('rowShow',setRow ? this.currentRow ? this.currentRow : this.list[0] : this.list[0])
       console.log(res)
@@ -115,7 +120,7 @@ export default {
     // }
   },
   mounted () {
-    this.queryOptions()
+    this.queryOptions(true)
   },
   created() {
     this.tablecols = this.tool.tabelCol(this.$route.name).optiontTable.tablecols

src/SManagement/archives_ad/components/Edit.vue

@@ -1,5 +1,5 @@
 <template>
-  <span @click.stop="edit()">编辑</span>
+  <el-button type="text" size="mini" @click.stop="edit()" :disabled="fileData.isAuth == 0">编辑</el-button>
 </template>
 
 <script>

src/SManagement/archives_ad/components/delete.vue

@@ -1,11 +1,11 @@
 <template>
 <div class="delete">
-  <span @click.stop="dialogVisible = true">删除</span>
+  <el-button :disabled="data.isAuth == 0" type="text" size="mini" @click.stop="dialogVisible = true">删除</el-button>
   <el-dialog append-to-body title="提示" :visible.sync="dialogVisible" width="30%">
     <span>是否永久删除素材?</span>
     <span slot="footer" class="dialog-footer">
-      <el-button @click.stop="dialogVisible = false">取 消</el-button>
-      <el-button type="primary" @click.stop="remove()">确 定</el-button>
+      <el-button size="small" @click.stop="dialogVisible = false">取 消</el-button>
+      <el-button  size="small" type="primary" @click.stop="remove()">确 定</el-button>
     </span>
   </el-dialog>
 </div>
@@ -30,7 +30,7 @@ export default {
       let param = {
         "id": 20221102143602,
         "content": {
-          "sat_sharematerialid": [this.data.sat_sharematerialid]
+          "sat_sharematerialids": [this.data.sat_sharematerialid]
         }
       }
       let res = this.$api.requested(param)

src/SManagement/archives_ad/components/list.vue

@@ -20,7 +20,7 @@
             <span>{{item.newcount}}</span>
           </div>
         </div>
-        <div class="handle" v-if="isHandle">
+        <div class="handle">
           <slot name="edit" :data="item"></slot>
           <slot name="delete" :data="item"></slot>
         </div>
@@ -39,7 +39,7 @@ export default {
       currentItem:[]
     };
   },
-  props: ['fileData','isHandle'],
+  props: ['fileData'],
   computed: {
     
   },

src/SManagement/archives_admag/index.vue

@@ -5,14 +5,30 @@
       <add ref="add" />
     </Header>
     <div class="normal-card">
-      <!-- 搜索及分类筛选 -->
-      <filterList @changeTypeId="changeTypeId" @startSearch="startSearch">
-        <span style="flex: 1;display: flex;justify-content: flex-end;">
-          <hot-new-control @sortTypeChange="sortTypeChange" />
-        </span>
-      </filterList>
+      <div style="display:flex;align-items:center">
+        <div style="display:flex;align-items:center;padding-bottom:15px">
+          <p style="font-size:14px;margin-right:10px;width:50px">范围:</p>
+          <el-select v-model="params.content.where.type" placeholder="请选择素材范围" size="small" @change="getFileList">
+            <el-option
+              label="全部"
+              :value="0">
+            </el-option>
+            <el-option
+              label="我的"
+              :value="1">
+            </el-option>
+          </el-select>
+        </div>
+        <!-- 搜索及分类筛选 -->
+        <filterList @changeTypeId="changeTypeId" @startSearch="startSearch">
+          <span style="flex: 1;display: flex;justify-content: flex-end;">
+            <hot-new-control @sortTypeChange="sortTypeChange" />
+          </span>
+        </filterList>
+      </div>
+      
       <!--素材列表-->
-      <list :fileData="fileData" @listItemClick="listItemClick" :isHandle="true"
+      <list :fileData="fileData" @listItemClick="listItemClick"
         v-if="tool.checkAuth($route.name, 'read')">
         <template v-slot:edit="scope">
           <Edit :fileData="scope.data" v-if="tool.checkAuth($route.name, 'update')"></Edit>
@@ -28,7 +44,7 @@
       </detail>
     </div>
     <!--抽屉面板-->
-    <!-- <el-drawer
+    <el-drawer
       title="我是标题"
       :visible.sync="drawer"
       :with-header="false"
@@ -39,7 +55,7 @@
       <div class="detail__panel">
         <router-view/>
       </div>
-    </el-drawer> -->
+    </el-drawer>
   </div>
 </template>
 
@@ -66,14 +82,15 @@ export default {
       drawer:false,
       params: {
         "classname": "saletool.sharematerial.sharematerial",
-        "method": "selectMyList",
+        "method": "selectList",
         "content": {
           "pageNumber": 1,
-          "pageSize": 12,
+          "pageSize": 16,
           "nocache": true,
           "where": {
             "condition": "",
-            "sat_sharematerial_classid": null
+            "sat_sharematerial_classid": null,
+            "type":0,
           }
         }
       },
@@ -140,6 +157,7 @@ export default {
     },
     /* 开始搜索 */
     startSearch(value) {
+      this.params.content.pageNumber = 1
       this.params.content.where.condition = value;
       this.getFileList(true);
     },
@@ -153,6 +171,8 @@ export default {
       if (deleteList.length != 0) return this.handleDelete(deleteList);
       this.total = res.total
       this.fileData = res.data
+      console.log(this.fileData);
+      
       this.fileData.forEach((item) => {
         item.attinfos = matchingFileType.fileList(item.attinfos)
       })
@@ -221,7 +241,7 @@ export default {
 }
 
 .normal-card {
-  min-height: calc(100vh - 138px);
+  min-height: calc(100vh - 190px);
   box-sizing: border-box;
   position: relative;
 }
@@ -255,12 +275,6 @@ export default {
   height: 34px;
 }
 
-.el-button {
-  width: 180px;
-  border-radius: 4px 4px 4px 4px;
-  border: 1px solid #3874F6;
-}
-
 /deep/.el-button span {
   transform: translateX(-5px) !important;
 }

src/SManagement/user/team-manage/TeamManage.vue

@@ -9,7 +9,8 @@
       tableName="teamTable" 
       idName="sys_enterprise_hrid"
       :apiId="{query:20221107094704,del:20221107094804}"
-      :options="options">
+      :options="options"
+      @listCreate="list">
       <div slot="custom"></div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'rolenames'">

src/router/HDrpManagement.js

@@ -322,7 +322,28 @@ const HDrpManagement = [
         component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/productMoneyOdd/modules/detail')
       }
     ]
-  }
+  },{
+    path: '/contract_manage',
+    name:'contract',
+    meta: {
+      title: '合同管理',
+      ast_nav: true,
+      keeproute: true,
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/contractManage/index'),
+    children:[
+      {
+        path: '/addContract',
+        name: 'contract',
+        meta: {
+          title: '商品调整单详情',
+          ast_nav:true,
+          keeproute: true
+        },
+        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/contractManage/components/addContract')
+      }
+    ]
+  },
   
 ];
 export default HDrpManagement;

src/router/SManagement.js

@@ -47,7 +47,7 @@ const SManagement = [{
   path: '/archives_admag',
   name: 'archives_admag',
   meta: {
-    title: ' 我的素材',
+    title: ' 素材',
     ast_nav: true,
     upload: true
   },

src/style/style.css

@@ -205,7 +205,6 @@ ul{
 }
 .search__label{
   display: inline-block;
-  width: 80px;
   margin-right:10px;
   text-align: right;
   font-size: 14px;

src/views/mediaStock/modules/list.vue

@@ -18,13 +18,13 @@
         <div class="fileRouter__history" v-for="(route,index) in fileRouter" :key="route.index" @click="folderDetails(route,index)">{{route.document}}&nbsp;<span v-show="fileRouter.length - 1 !== index"> > </span>&nbsp;</div>
       </div>
       <div class="flex-align-stretch flex-warp">
-        <div v-for="(folder,index) in list" :key="folder.id" class="folder-item" :class="folder.ischeck?'checked':''">
+        <div v-for="(folder,index) in list" @dblclick.stop="folderDetails(folder)" @click="fileDetail(folder)" :key="folder.id" class="folder-item" :class="folder.ischeck?'checked':''">
           <el-checkbox class="folder-checkbox" v-model="folder.ischeck" @change="onChange(folder)"></el-checkbox>
           <div class="op__panel">
             <delete-temp :self="true" :checklist="[folder]" style="margin-right:5px" @onSuccess="queryAttachment"></delete-temp>
             <operation-temp :ref="'edit' + index" :self="true" :checklist="[folder]" @restName="restName"  @onSuccess="queryAttachment"></operation-temp>
           </div>
-          <div @click.stop="folderDetails(folder)" class="img-panel">
+          <div class="img-panel">
             <div class="image__item__panel" v-if="folder.postfix === 'DOC' || folder.postfix === 'DOCX'">
               <img  src="@/assets/file_icons/word.png" alt="">
             </div>
@@ -188,6 +188,9 @@ export default {
         this.queryAttachment(folder.attachmentid)
       }
     },
+    fileDetail (file) {
+      this.$emit('folderChecked',[file])
+    },
     restChecked () {
       this.list.forEach((e,index)=>{
         e.ischeck = false