1

src/components/FirstJob/recordBill.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="recordBill-container w">
+  <div class="recordBill-container f40 w">
     <!-- 面包屑 -->
     <a-breadcrumb class="w">
       <a-breadcrumb-item href>
@@ -166,6 +166,14 @@
         </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)">
+            <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>
+            </a-radio-group>
+          </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>
@@ -237,6 +245,7 @@ export default {
       fileListT2: [],
       // facetimedate: "",
       previewVisible: false,
+      currentPolicy: 1,
       proxyStatus: '', // 代理选择的控制
       storeStatus: '', // 企业选择的控制
       jobnameStatus: '', // 岗位选择的控制
@@ -384,7 +393,7 @@ export default {
     this.getProxyInfo(this.proxyinfo.id)
     this.getJob(this.firminfo)
     this.getPolicyByJobId(this.firminfo.id)
-    this.getPolicyListByJobId(this.firminfo.id)
+    // this.getPolicyListByJobId(this.firminfo.id)
   },
   /**
    * el 被新创建的 vm.el 替换，并挂载到实例上去之后调用该钩子。
@@ -427,7 +436,25 @@ export default {
         const { data } = await getPolicyListByJobIdApi(value)
         console.log(data)
         if (data.status === 200) {
-          this.form.policy = data.data
+          // 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) {
         console.log(error)
@@ -463,7 +490,12 @@ export default {
     handleOk() {
       var that = this
       console.log(that.fileListT2)
-
+          // 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)
@@ -479,8 +511,10 @@ export default {
           })
           let dataObj = qs.stringify({
             ...this.form,
+            storeJobPolicyId: this.currentPolicy,
             storeJobId: this.firminfo.id,
           })
+          console.log(dataObj);
           const { data } = await recordBillApi(dataObj)
           if (data.status === 200) {
             console.log(data)
@@ -898,6 +932,7 @@ export default {
       console.log(value)
       // this.storeJobList = [];
       // if(!isEmptyCheck(this.form.qiyeId)){
+      // this.getPolicyListByJobId(value.id)
       this.getPolicyByJobId(value.id)
       this.form.storeJobId = value.id
       this.jobnameStatus = ''
@@ -939,6 +974,15 @@ export default {
         policy.style.maxHeight = '230px'
       }
     },
+    /**
+     * 政策单选变化
+     *
+     *
+     */
+    policyChange(e) {
+      console.log(e.target.value)
+      this.currentPolicy = e.target.value
+    },
   },
 }
 </script>
@@ -1023,34 +1067,34 @@ export default {
   }
 }
 
-// /deep/ .ant-radio {
+/deep/ .ant-radio {
-//   border-color: #ddd;
+  border-color: #ddd;
-//   box-shadow: none;
+  box-shadow: none;
 
-//   &:after {
+  &:after {
-//     display: none;
+    display: none;
-//   }
+  }
 
-//   &:hover .ant-radio-inner {
+  &:hover .ant-radio-inner {
-//     border-color: #ff4400 !important;
+    border-color: #ff4400 !important;
-//     box-shadow: none;
+    box-shadow: none;
-//   }
+  }
-// }
+}
 
-// /deep/ .ant-radio-checked {
+/deep/ .ant-radio-checked {
-//   .ant-radio-input:focus {
+  .ant-radio-input:focus {
-//     box-shadow: none;
+    box-shadow: none;
-//   }
+  }
 
-//   .ant-radio-inner {
+  .ant-radio-inner {
-//     border-color: #ff4400;
+    border-color: #ff4400;
-//     box-shadow: none;
+    box-shadow: none;
 
-//     &::after {
+    &::after {
-//       background-color: #ff4400 !important;
+      background-color: #ff4400 !important;
-//     }
+    }
-//   }
+  }
-// }
+}
 
 .ant-col {
   .ant-form-item {

src/components/merchantManagement/memberInfo.vue

@@ -856,6 +856,7 @@ export default {
                 this.permissionName = getAgencyPermissionNameById(this.permission)
                 this.modalTitle = ''
                 this.getMemberList()
+                this.getMemberGroup()
               } else {
                 this.$message.warning(data.msg)
                 this.visible = false

src/components/userinfo/systemMsg.vue

@@ -2,7 +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="mark" slot-scope="record, text, index">{{ record.mark }}</div>
+      <div slot="mark" slot-scope="text, record">{{ record.mark }}</div>
       
     </a-table>
     <div class="pagecontainer f40">
@@ -153,6 +153,27 @@ export default {
       }
       this.getJobList()
       // console.log(e);
+    },
+       pageChange(e) {
+      // console.log(e);
+      this.formvalue.pageNum = e
+      this.$refs.pageinput.value = ''
+      // this.getJobList()
+    },
+    inputpageChange(e) {
+      const pagenumcount = this.formvalue.total / this.formvalue.pageSize
+      // console.log(pagenumcount);
+      if (e.target.value) {
+        if (e.target.value > pagenumcount) {
+          this.formvalue.pageNum = Math.ceil(pagenumcount)
+        } else {
+          this.formvalue.pageNum = e.target.value
+        }
+      } else {
+        this.formvalue.pageNum = 1
+      }
+      // this.getJobList()
+      // console.log(e);
     },
   },
 }

src/components/userinfo/teamMsg.vue

@@ -25,7 +25,7 @@ export default {
   data() {
     return {
       isspinning: false,
-      formvalue:{},
+      formvalue: {},
       pagination: {
         hideOnSinglePage: false,
         showQuickJumper: true,
@@ -166,6 +166,27 @@ export default {
       this.getJobList()
       // console.log(e);
     },
+    pageChange(e) {
+      // console.log(e);
+      this.formvalue.pageNum = e
+      this.$refs.pageinput.value = ''
+      // this.getJobList()
+    },
+    inputpageChange(e) {
+      const pagenumcount = this.formvalue.total / this.formvalue.pageSize
+      // console.log(pagenumcount);
+      if (e.target.value) {
+        if (e.target.value > pagenumcount) {
+          this.formvalue.pageNum = Math.ceil(pagenumcount)
+        } else {
+          this.formvalue.pageNum = e.target.value
+        }
+      } else {
+        this.formvalue.pageNum = 1
+      }
+      // this.getJobList()
+      // console.log(e);
+    },
   },
 }
 </script>

src/components/userinfo/usercenter/components/dataStatistics.vue

@@ -177,7 +177,7 @@
       </a-table>
       <div class="pagecontainer mt16" v-if="billList.length > 0">
         <!-- <a-pagination :current="billPagination.pageNum" :default-current="1" :defaultPageSize="10" :total="billPagination.total" @change="onChange" /> -->
-        <a-pagination :current="billPagination.pageNum"  :default-current="1" :defaultPageSize="20" :show-total="total => `共${total}条`" :total="billPagination.total" @change="onChange" size="small" show-size-changer show-quick-jumper />
+        <a-pagination :current="billPagination.pageNum" :default-current="1" :defaultPageSize="20" :show-total="total => `共${total}条`" :total="billPagination.total" @change="onChange" size="small" show-size-changer show-quick-jumper />
         <!-- <div class="ant-pagination-options-quick-jumper ml12">
           <span>共{{ billPagination.total }}条，</span>跳至
           <input ref="pageinput" type="text" @keyup.enter="inputpageChange" @blur="inputpageChange" />页
@@ -1197,17 +1197,12 @@ td:empty:before {
     float: unset;
     text-align: center;
   }
-  .ant-table-header {
+  .ant-table-thead {
-    th {
+    > tr {
-      div {
+      > th {
-        font-weight: bold;
+        font-weight: bold !important;
       }
     }
-    .ant-table-row-cell-break-word {
-      // text-align: right;
-      font-weight: bold;
-      // padding-right: 0;
-    }
   }
   // .ant-table-body::-webkit-scrollbar {
   //   width: 0 !important;