diff --git a/src/components/FirstJob/recordBill.vue b/src/components/FirstJob/recordBill.vue
index d2af526..68a7a45 100644
--- a/src/components/FirstJob/recordBill.vue
+++ b/src/components/FirstJob/recordBill.vue
@@ -166,14 +166,17 @@
         </a-form-model-item>-->
         <a-form-model-item ref="policy" label="政策" prop="policy" class="policyContainer" :wrapperCol="{ span: 18 }" :labelCol="{ span: 4 }">
           <!-- <a-input v-model="form.policy" type='textarea'/> -->
-          <!-- <div style="transform:translateY(8px)">
+          <!-- <div style="transform:translateY(8px)" v-if="form.policy.length != 0">
             <a-radio-group v-model="currentPolicy" @change="policyChange($event)">
-              <a-radio v-for="item in form.policy" :value="item.id">
-                {{item.label}}
-                <div class="mt12" style="max-width:480px;white-space: pre-line;">{{item.content}}</div>
-              </a-radio>
+              <div v-for="(item,index) in form.policy">
+                <a-radio :value="item.id">
+                  {{'政策' + (index + 1)}}
+                  <div class="mt12" style="max-width:480px;white-space: pre-line;">{{item.policy}}</div>
+                </a-radio>
+              </div>
             </a-radio-group>
-          </div> -->
+          </div>
+          <div v-else>-</div> -->
           <div class="policy" style="min-height: 30px !important">{{ form.policy }}</div>
           <div class="openContral" v-if="isContainerShow">
             <span v-if="isFold" @click="toFold(1)">展开</span>
@@ -206,7 +209,7 @@
 							boxShadow: 'none',
 							textShadow: 'none',
 						}">取消</a-button>
-          <a-button style="margin-left: 10px; color: #fff; background-color: #ff4400; border-color: #ff4400" @click="handleOk" :loading="confirmLoading">提交</a-button>
+          <a-button style="margin-left: 10px; color: #fff; background-color: #ff4400; border-color: #ff4400" @click="handleOk" :disabled="confirmLoading" :loading="confirmLoading">提交</a-button>
         </div>
       </div>
     </div>
@@ -436,24 +439,24 @@ export default {
         const { data } = await getPolicyListByJobIdApi(value)
         console.log(data)
         if (data.status === 200) {
-          // this.form.policy = data.data
-          this.form.policy = [
-            {
-              label: '政策1',
-              content: '政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容',
-              id: 1,
-            },
-            {
-              label: '政策1',
-              content: '政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容',
-              id: 2,
-            },
-            {
-              label: '政策1',
-              content: '政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容',
-              id: 3,
-            },
-          ]
+          this.form.policy = data.data
+          // this.form.policy = [
+          //   {
+          //     label: '政策1',
+          //     content: '政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容',
+          //     id: 1,
+          //   },
+          //   {
+          //     label: '政策1',
+          //     content: '政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容',
+          //     id: 2,
+          //   },
+          //   {
+          //     label: '政策1',
+          //     content: '政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容政策内容',
+          //     id: 3,
+          //   },
+          // ]
           this.currentPolicy = this.form.policy[0].id
         }
       } catch (error) {
@@ -490,31 +493,31 @@ export default {
     handleOk() {
       var that = this
       console.log(that.fileListT2)
-          // let dataObj = {
-          //   ...this.form,
-          //   storeJobPolicyId: this.currentPolicy,
-          //   storeJobId: this.firminfo.id,
-          // }
-          // console.log(dataObj);
+      // let dataObj = {
+      //   ...this.form,
+      //   storeJobPolicyId: this.currentPolicy,
+      //   storeJobId: this.firminfo.id,
+      // }
+      // console.log(dataObj);
       this.$refs.ruleForm.validate(async (ispass, no) => {
         console.log(this.form)
         console.log(ispass)
         console.log(no)
+        if (this.confirmLoading == true) {
+          return
+        }
         this.confirmLoading = true
-
         if (ispass) {
           console.log(this.form)
           this.form['imgs'] = that.fileListT2.toString()
-          console.log({
-            ...this.form,
-            storeJobId: this.firminfo.id,
-          })
+
           let dataObj = qs.stringify({
             ...this.form,
-            storeJobPolicyId: this.currentPolicy,
             storeJobId: this.firminfo.id,
+            // storeJobPolicyId: this.currentPolicy,
+            // policy: '',
           })
-          console.log(dataObj);
+          console.log(dataObj)
           const { data } = await recordBillApi(dataObj)
           if (data.status === 200) {
             console.log(data)
diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue
index d9782a2..805d620 100644
--- a/src/components/merchantManagement/memberInfo.vue
+++ b/src/components/merchantManagement/memberInfo.vue
@@ -109,8 +109,8 @@
             </div>
             <div slot="setting" v-if="!record.children" class="setting" slot-scope="text, record" style="color: #1890FF">
               <!-- <a @click="showDetail('detail', record)">详情</a> -->
-              <a v-if="loginUserInfo.agencyRole != 3" class="delete" @click="showDetail('edit', record)">编辑</a>
-              <a v-if="loginUserInfo.agencyRole != 3" @click="deleteMemeber(record)">删除</a>
+              <a v-if="loginUserInfo.agencyRoleId != 7263" class="delete" @click="showDetail('edit', record)">编辑</a>
+              <a v-if="loginUserInfo.agencyRoleId != 7263" @click="deleteMemeber(record)">删除</a>
             </div>
           </a-table>
           <div class="pagecontainer mt16">
@@ -597,7 +597,11 @@ export default {
               // item1.children.forEach((item) => {
               item.inAgencyStatistics = item.inAgencyStatistics == 0 ? true : false
               item.showAgencyScreen = item.showAgencyScreen == 0 ? true : false
-              item.role = getAgencyRoleTypeById(item.agencyRole)
+              if (item.agencyRoleId != 7261 && item.agencyRoleId != 7262 && item.agencyRoleId != 7263) {
+                item.role = item.agencyRoleName
+              } else {
+                item.role = getAgencyRoleTypeById(item.agencyRoleId)
+              }
               item.permission = getAgencyPermissionNameById(item.agencyPermissions)
               // })
             })
@@ -772,11 +776,19 @@ export default {
         this.visible = true
       } else {
         this.modalTitle = '添加成员'
+        let agencyTeamId
+        this.groupList.forEach((item) => {
+          if (item.teamName == this.selectedKeys[0]) {
+            agencyTeamId = item.id
+          }
+        })
+        console.log(agencyTeamId);
         this.visible = true
         this.$nextTick(() => {
           console.log(123)
           that.form.setFieldsValue({
             agencyRoleId: 7263,
+            agencyTeamId,
           })
         })
       }
@@ -877,7 +889,7 @@ export default {
               if (data.status == 200) {
                 this.$message.success('新建成功')
                 this.visible = false
-                this.permission = getAgencyPermissionsByRole(1)
+                this.permission = getAgencyPermissionsByRole(7261)
                 this.permissionName = getAgencyPermissionNameById(this.permission)
                 this.modalTitle = ''
                 this.getMemberList()
@@ -923,10 +935,10 @@ export default {
       this.form.setFieldsValue({
         agencyRoleId: e.target.value,
       })
-      if (this.form.getFieldValue('agencyRole') == 1) {
-        this.permission = getAgencyPermissionsByRole(1)
+      if (this.form.getFieldValue('agencyRoleId') == 7261) {
+        this.permission = getAgencyPermissionsByRole(7261)
       } else {
-        this.permission = getAgencyPermissionsByRole(2)
+        this.permission = getAgencyPermissionsByRole(7261)
       }
       console.log(this.permission)
       this.permissionName = getAgencyPermissionNameById(this.permission)
diff --git a/src/components/userinfo/systemMsg.vue b/src/components/userinfo/systemMsg.vue
index 628ba90..7f8e1ad 100644
--- a/src/components/userinfo/systemMsg.vue
+++ b/src/components/userinfo/systemMsg.vue
@@ -2,8 +2,8 @@
   <div class="w">
     <a-table :columns="columns" :data-source="contentList" :pagination="false" class="mt16" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle'}" :rowKey="(record) => record.id">
       <!-- <a slot="index" slot-scope="record, text, index">{{ index + 1 }}</a> -->
-      <div slot="mark" slot-scope="text, record">{{ record.mark }}</div>
-      
+      <!-- <div slot="mark" slot-scope="text, record">{{ record.mark }}</div> -->
+      <div slot="mark" style="text-decoration: underline;cursor:pointer;" slot-scope="text, record" @click="previewContent(record)">{{ record.mark }}</div>
     </a-table>
     <div class="pagecontainer f40">
       <a-pagination :current="+formvalue.pageNum" :default-current="1" :defaultPageSize="8" :total="formvalue.total" @change="pageChange" />
@@ -12,6 +12,12 @@
         <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
       </div>
     </div>
+    <a-modal class="billDetailModal" v-model="billDetailVisible" width="800px" @cancel="billDetailModalClose" :footer="null">
+      <div slot="title">通知详情</div>
+      <div class="f24 tac">{{currentContent.mark}}</div>
+      <div class="f14 tac cccc mb32">{{currentContent.fbsj}}</div>
+      <div style="white-space: pre-line;min-height:500px;padding:0 56px" v-html="currentContent.desp"></div>
+    </a-modal>
   </div>
 </template>
 
@@ -27,6 +33,8 @@ export default {
   data() {
     return {
       isspinning: false,
+      currentContent: '',
+      billDetailVisible: false,
       formvalue: {},
       pagination: {
         hideOnSinglePage: false,
@@ -139,6 +147,11 @@ export default {
   mounted() {},
   // 组件方法
   methods: {
+    previewContent(val) {
+      console.log(val)
+      this.billDetailVisible = true
+      this.currentContent = val
+    },
     inputpageChange(e) {
       const pagenumcount = this.formvalue.total / this.formvalue.pageSize
       // console.log(pagenumcount);
@@ -154,7 +167,7 @@ export default {
       this.getJobList()
       // console.log(e);
     },
-       pageChange(e) {
+    pageChange(e) {
       // console.log(e);
       this.formvalue.pageNum = e
       this.$refs.pageinput.value = ''
@@ -226,4 +239,7 @@ export default {
     }
   }
 }
+/deep/.ant-modal-header {
+  background-color: #f5f5f5;
+}
 </style>
diff --git a/src/components/userinfo/teamMsg.vue b/src/components/userinfo/teamMsg.vue
index 2dd8c89..90603e5 100644
--- a/src/components/userinfo/teamMsg.vue
+++ b/src/components/userinfo/teamMsg.vue
@@ -2,6 +2,7 @@
   <div class="w">
     <a-table :columns="columns" :data-source="contentList" :pagination="false" class="mt16" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle'}" :rowKey="(record) => record.id">
       <!-- <a slot="index" slot-scope="record, text, index">{{ index + 1 }}</a> -->
+      <div slot="despOut" style="text-decoration: underline;cursor:pointer;" slot-scope="text, record" @click="previewContent(record)">{{ record.despOut }}</div>
     </a-table>
     <div class="pagecontainer f40">
       <a-pagination :current="+formvalue.pageNum" :default-current="1" :defaultPageSize="8" :total="formvalue.total" @change="pageChange" />
@@ -10,6 +11,12 @@
         <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
       </div>
     </div>
+    <a-modal class="billDetailModal" v-model="billDetailVisible" width="800px" @cancel="billDetailModalClose" :footer="null">
+      <div slot="title">通知详情</div>
+      <div class="f24 tac">{{currentContent.mark}}</div>
+      <div class="f14 tac cccc mb32">{{currentContent.fbsj}}</div>
+      <div class="" style="white-space: pre-line;min-height:500px;padding:0 56px" v-html="currentContent.desp"></div>
+    </a-modal>
   </div>
 </template>
 
@@ -24,6 +31,8 @@ export default {
   // 组件状态值
   data() {
     return {
+      billDetailVisible: false,
+      currentContent: '',
       isspinning: false,
       formvalue: {},
       pagination: {
@@ -151,6 +160,11 @@ export default {
   mounted() {},
   // 组件方法
   methods: {
+    previewContent(val) {
+      console.log(val)
+      this.billDetailVisible = true
+      this.currentContent = val
+    },
     inputpageChange(e) {
       const pagenumcount = this.formvalue.total / this.formvalue.pageSize
       // console.log(pagenumcount);
@@ -237,4 +251,7 @@ export default {
     }
   }
 }
+/deep/.ant-modal-header{
+  background-color: #f5f5f5;
+}
 </style>
diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue
index 1434202..98261ce 100644
--- a/src/components/userinfo/usercenter/components/dataStatistics.vue
+++ b/src/components/userinfo/usercenter/components/dataStatistics.vue
@@ -941,7 +941,7 @@ export default {
           break
         case 40:
           this.dateType = '入职时间'
-          this.dateVal = 'status40OperateTime'
+          this.dateVal = 'entryTime'
           break
         case 50:
           this.dateType = '入职时间'
diff --git a/src/style/index.less b/src/style/index.less
index 26f8bac..11688eb 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -1,5 +1,21 @@
-@import "http://at.alicdn.com/t/c/font_3135652_wh8pz6ovidi.css";
-
+@import "http://at.alicdn.com/t/c/font_3135652_2ixc8rvuv5b.css";
+@font-face {
+	font-family: "DingTalk"; /* 这里的字体名称是自定义的 */
+	src: url("https://matripecandy.oss-cn-beijing.aliyuncs.com/1shoudanImg/DingTalk%20Sans.ttf"); /* 服务器上ttf文件的路径，记得配置域名权限 */
+	font-weight: normal;
+	font-style: normal;
+	font-display: swap;
+}
+.lNum {
+	opacity: 0.6;
+	font-size: 32px;
+	font-weight: 400;
+	text-align: right;
+	color: #ff4400;
+	line-height: 39px;
+	margin-right: 12px;
+	font-family: "DingTalk";
+}
 // 初始化页面样式
 body,
 h1,
diff --git a/src/utils/commonUtil.js b/src/utils/commonUtil.js
index 48976d1..1b71676 100644
--- a/src/utils/commonUtil.js
+++ b/src/utils/commonUtil.js
@@ -1569,9 +1569,9 @@ export function getAgeFromBirthday (bir) {
  */
 export function agencyRoleTypeArray () {
   let workTypeArray = [
-    { id: 1, name: "创建人", value: "1", text: "创建人", checked: false },
-    { id: 2, name: "管理员", value: "2", text: "管理员", checked: false },
-    { id: 3, name: "成员", value: "3", text: "成员", checked: false },
+    { id: 7261, name: "创建人", value: 7261, text: "创建人", checked: false },
+    { id: 7262, name: "管理员", value: 7262, text: "管理员", checked: false },
+    { id: 7263, name: "成员", value: 7263, text: "成员", checked: false },
   ];
   return workTypeArray;
 }