Merge branch 'xiaoqin' into mergeBranch

src/HManagement/addressList/mygroup/modules/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="container normal-panel normal-margin">
     <el-button type="primary" size="small" icon="el-icon-plus" @click="dialogFormVisible = true">新建群组</el-button>
-    <el-dialog title="新建群组" :visible.sync="dialogFormVisible" width="600px">
+    <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">
         <el-form-item label="群组名称" prop="groupname" :rules="[
           { required: true, message: '群组名称不能为空'},

src/HManagement/addressList/mygroup/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="inline-16">
     <el-button type="text" icon="el-icon-edit" size="small" class="inline-16" style="color:#333" @click="onShow()">编 辑</el-button>
-    <el-dialog title="编辑群组" :visible.sync="dialogFormVisible" width="600px">
+    <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">
         <el-form-item label="群组名称" prop="groupname" :rules="[
           { required: true, message: '群组名称不能为空'},

src/HManagement/clueManage/clue_import/detailPage/modules/billBody.vue

@@ -50,7 +50,7 @@
           <span style="color:red">{{scope.column.data[scope.column.columnname]}}</span>
         </div>
         <span v-else>{{scope.column.data[scope.column.columnname]}}</span>
-        <span v-if="!scope.column.data[scope.column.columnname] && scope.column.columnname != 'operation'">--</span>
+        <span v-if="!scope.column.data[scope.column.columnname] && scope.column.columnname != 'operation' && scope.column.columnname != 'errmsg'">--</span>
       </template>
       <template v-slot:opreation="scope">
         <body-edit 

src/HManagement/department/staff/list/modules/add.vue

@@ -43,7 +43,7 @@
             </el-form-item>
           </el-col>
           <el-col class="mb-30" :span="12">
-            <el-form-item label="部门:">
+            <el-form-item label="部门:" prop="depname">
               <el-popover
                 placement="bottom"
                 width="400"
@@ -112,6 +112,11 @@ export default {
       sys_options:'sys_options'
     })
   },
+  watch: {
+    dialogFormVisible(val) {
+      !val && this.$refs.form.resetFields()
+    }
+  },
   data () {
     return {
       dialogFormVisible:false,
@@ -123,6 +128,9 @@ export default {
         name: [
           { required: true, message: '请输入员工姓名', trigger: 'blur' },
         ],
+        depname: [
+          { required: true, message: '请选择部门', trigger: 'change' },
+        ],
         phonenumber: [
           { required: true, message: '请输入员工电话', trigger: 'blur' },
           { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }

src/HManagement/department/staff/list/modules/edit.vue

@@ -43,7 +43,7 @@
             </el-form-item>
           </el-col>
           <el-col class="mb-30" :span="12">
-            <el-form-item label="部门:">
+            <el-form-item label="部门:" prop="depname">
               <el-popover
                 placement="bottom"
                 width="400"
@@ -121,6 +121,9 @@ export default {
         name: [
           { required: true, message: '请输入员工姓名', trigger: 'blur' },
         ],
+        depname: [
+          { required: true, message: '请选择部门', trigger: 'change' },
+        ],
         phonenumber: [
           { required: true, message: '请输入员工电话', trigger: 'blur' },
           { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }

src/HManagement/notice/index.vue

@@ -7,6 +7,7 @@
       idName="sat_noticeid"
       :apiId="{query:20221101094903,del:20221101095103}"
       :options="options"
+      @listData="list"
       >
     >
     <div slot="titleRight">
@@ -137,6 +138,24 @@ export default {
     this.getAccountType()
   },
   methods:{
+    /* 删除新建产生的无效通告 */
+    async list (data) {
+      let initID = '9999' + JSON.parse(window.sessionStorage.getItem("active_account")).userid;
+      let deleteList = [];
+      data.forEach(v => (initID == v.sat_notice_classid && v.title == '') ? deleteList.push(v.sat_noticeid) : '');
+      if (deleteList.length != 0) this.handleDelete(deleteList);
+    },
+    /* 处理批量删除 */
+    handleDelete(list) {
+      this.$api.requested({
+        "id":20221101095103,
+        "content": {
+          "sat_noticeids": list
+        }
+      }).then(res => {
+        if (res.msg == '成功') this.$refs.list.listData();
+      })
+    },
     closeDrawer () {
       this.$store.dispatch('DrawerShowChange',false)
       this.$router.push({path:"notice_mag_list"})

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

@@ -15,7 +15,7 @@ export default {
       folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
       form:{
         "sat_noticeid":0,
-        "sat_notice_classid": 0,
+        "sat_notice_classid": '9999' + JSON.parse(sessionStorage.getItem('active_account')).userid,
         "title": "",
         "summary": "",
         "content": "",

src/HManagement/roleManage/modules/edit.vue

@@ -33,7 +33,7 @@
         </div>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -67,6 +67,7 @@ export default {
       },
     }
   },
+  props:['data'],
   components:{
     roleContentTemp
   },
@@ -76,6 +77,7 @@ export default {
   methods:{
     editBtn () {
       this.drawer = true
+      this.form = Object.assign({},this.form,this.data)
     },
     onSuccess () {
       this.drawer = false

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

@@ -8,9 +8,9 @@
       </div>
       <div>
         <el-row :gutter="20">
-          <el-form :model="form"   ref="form"  size="mini" label-position="right" label-width="90px">
+          <el-form :model="form"   ref="form" :rules="rules"  size="mini" label-position="right" label-width="90px">
             <el-col :span="20">
-              <el-form-item  label="分类名称:">
+              <el-form-item  label="分类名称:" prop="value">
                 <el-input type="textarea" autosize v-model="form.value" placeholder="输入分类名称"></el-input>
               </el-form-item>
             </el-col>
@@ -43,6 +43,11 @@ export default {
         "value":"",
         "remarks":"",
         "sequence":2
+      },
+      rules:{
+        value:[
+          { required: true, message: '请输入标签名', trigger: 'blur'},
+        ],
       }
     }
   },

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

@@ -8,9 +8,9 @@
       </div>
       <div>
         <el-row :gutter="20">
-          <el-form :model="form"   ref="form"  size="mini" label-position="right" label-width="90px">
+          <el-form :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="90px">
             <el-col :span="20">
-              <el-form-item  label="分类名称:">
+              <el-form-item  label="分类名称:" prop="value">
                 <el-input type="textarea" autosize v-model="form.value" placeholder="输入分类名称"></el-input>
               </el-form-item>
             </el-col>
@@ -45,6 +45,11 @@ export default {
         value:'',
         remarks:'',
         sequence:2
+      },
+      rules:{
+        value:[
+          { required: true, message: '请输入标签名', trigger: 'blur'},
+        ],
       }
     }
   },

src/HManagement/siteManage/tagManage/components/edit.vue

@@ -51,7 +51,8 @@ export default {
         tag:'',
         result:'',
         helptips:'',
-        sys_systemtagid:0,
+        sys_systemtagid:'',
+        sys_systemtagdetailid:''
       },
       result:[],
       rules:{

src/HManagement/siteManage/tagManage/index.vue

@@ -5,8 +5,8 @@
       ref="basicLayout" 
       formPath="tagManage" 
       tableName="dataTagDetailTable" 
-      idName="sys_systemtagid" 
-      :apiId="{query:20221013104401,del:''}" 
+      idName="sys_systemtagdetailid" 
+      :apiId="{query:20221013104401,del:20221013104601}" 
       :options="options"
       @listCreate="list"
       @listData="listData"
@@ -41,6 +41,7 @@
         <div v-else>{{scope.data.column.data[scope.data.column.columnname]}}</div>
       </template>
       <template v-slot:tbOpreation="scope">
+        <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" @onSuccess="$refs.list.listData()" :data="scope.data.data"/>
         <mutextage 
           class="inline-16" 
           :tagData="selectTarget" 
@@ -83,10 +84,9 @@ export default {
   methods:{
     async deleteRow (data) {
       let res = await this.$api.requested({
-        "id": 20221013104601,
+        "id":20221013104601,
         "content": {
-          "sys_systemtagid": this.selectTarget,
-          "tags":[data.tag]
+          "sys_systemtagdetailids": [data.sys_systemtagdetailid],
         }
       })
       console.log(res);
@@ -96,6 +96,8 @@ export default {
     },
     listData (data) {
       this.allData = data
+      console.log(data);
+      
     },
     list (param) {
       param.content.sys_systemtagid = this.objectList[0].sys_systemtagid