行短稽核客户列表添加服务列表，任务动态

src/views/company/CompanyCheckCheck.vue

@@ -2,9 +2,9 @@
   <div>
     <a-page-header
       style="background-color: #FFFFFF;"
-      title="稽核详情-稽核信息"
+      title="业务列表-业务信息"
       sub-title=""
-      @back="showCheckDetail"
+      @back="showTaskList"
     >
       <a-descriptions :title="taskInfo.info.customerName" :column="3" :bordered="false">
         <a-descriptions-item label="客户编号">{{taskInfo.info.customerNo}}</a-descriptions-item>
@@ -16,7 +16,7 @@
         <a-descriptions-item label="员工工号">{{taskInfo.info.staffNo}}</a-descriptions-item>
       </a-descriptions>
     </a-page-header>
-    <a-card :bordered="false" :title="'稽核资料'" style="margin-top: 10px;">
+    <a-card :bordered="false" :title="'业务资料'" style="margin-top: 10px;">
       <a-form-model
         ref="ruleForm"
         :label-col="labelCol"
@@ -174,7 +174,7 @@
         <!--  返回按钮  -->
         <a-form-model-item :wrapper-col="{ span: 14, offset: 4 }" style="margin-top: 10px;">
           <a-space>
-            <a-button @click="showCheckDetail">
+            <a-button @click="showTaskList">
               返回
             </a-button>
           </a-space>
@@ -299,8 +299,8 @@ export default {
     this.badgeCount();
   },
   methods: {
-    showCheckDetail(){
-      this.$emit("goCheckDetail",this.taskInfo)
+    showTaskList(){
+      this.$emit("goTaskList",this.taskInfo)
     },
     fileTypeClick(a, event) {
       this.customerDataList();

src/views/company/CompanyCheckDetail.vue

@@ -1,205 +1,109 @@
  <template>
-   <div>
-     <a-page-header
-       style="background-color: #FFFFFF;"
-       title="稽核详情"
-       sub-title=""
-       @back="showTaskList"
-     >
-       <a-descriptions :title="taskInfo.info.customerName" :column="3" :bordered="false">
-         <a-descriptions-item label="任务名称">{{taskInfo.task.taskName}}</a-descriptions-item>
-         <a-descriptions-item label="开始时间">{{taskInfo.task.taskStartTime}}</a-descriptions-item>
-         <a-descriptions-item label="结束时间">{{taskInfo.task.taskEndTime}}</a-descriptions-item>
-         <a-descriptions-item label="任务状态">{{taskInfo.task.taskState_dictText}}</a-descriptions-item>
-         <a-descriptions-item label="任务描述" :span="2">{{taskInfo.task.description}}</a-descriptions-item>
-       </a-descriptions>
-     </a-page-header>
+   <!--  稽核任务动态  -->
+   <div style=" padding: 20px">
+     <a-row :gutter="16">
+       <a-col :span="8">
+         <a-card title="任务动态" style="width: 500px" :bordered="true">
+           <template #extra>
+             <a @click="handleToggleSearch1" style="margin-left: 8px">
+               {{ toggleSearchStatus1 ? '收起' : '展开' }}
+               <a-icon :type="toggleSearchStatus1 ? 'up' : 'down'"/>
+             </a>
+           </template>
+           <a-timeline>
+             <template v-if="toggleSearchStatus1">
+               <a-timeline-item>22-07-06 09:27 张文超提交了服务号【133****64621】的资料</a-timeline-item>
+               <a-timeline-item>22-07-04 09:27 张文超提交了服务号【133****64621】的资料</a-timeline-item>
+               <a-timeline-item>22-07-04 09:27 张文超提交了服务号【133****64621】的资料</a-timeline-item>
+               <a-timeline-item>22-07-04 09:27 张文超提交了服务号【133****64621】的资料</a-timeline-item>
+               <a-timeline-item>22-07-04 09:27 张文超提交了服务号【133****64621】的资料</a-timeline-item>
+               <a-timeline-item>22-07-06 09:27 张文超提交了服务号【133****64621】的资料</a-timeline-item>
+               <a-timeline-item>22-07-04 09:27 张文超提交了服务号【133****64621】的资料</a-timeline-item>
+               <a-timeline-item>22-07-04 09:27 张文超提交了服务号【133****64621】的资料</a-timeline-item>
+               <a-timeline-item>22-07-04 09:27 张文超提交了服务号【133****64621】的资料</a-timeline-item>
+               <a-timeline-item>22-07-04 09:27 张文超提交了服务号【133****64621】的资料</a-timeline-item>
+             </template>
+           </a-timeline>
+         </a-card>
+       </a-col>
+<!--       <a-col :span="8">
+         <a-card title="预警统计" style="width: 800px" :bordered="true">
+           <template #extra>
+             <a @click="handleToggleSearch2" style="margin-left: 8px">
+               {{ toggleSearchStatus2 ? '收起' : '展开' }}
+               <a-icon :type="toggleSearchStatus2 ? 'up' : 'down'"/>
+             </a>
+           </template>
+           <template v-if="toggleSearchStatus2">
+           <a-descriptions  :column="5" :bordered="true">
+             <a-descriptions-item label="总数">50</a-descriptions-item>
+             <a-descriptions-item label="未完善">5</a-descriptions-item>
+             <a-descriptions-item label="待稽核">10</a-descriptions-item>
+             <a-descriptions-item label="待整改">15</a-descriptions-item>
+             <a-descriptions-item label="通过">20</a-descriptions-item>
+           </a-descriptions>
 
-     <a-card :bordered="false" title="稽核信息" style="margin-top: 10px;">
-       <!-- 查询区域 -->
-       <div class="table-page-search-wrapper">
-         <a-form layout="inline" >
-           <a-row :gutter="24">
-             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-               <a-form-item label="服务号码">
-                 <j-input placeholder="请输入服务号码" v-model="queryParam.smsNumber"></j-input>
-               </a-form-item>
-             </a-col>
-             <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="query" icon="search">查询</a-button>
-              <a-button type="primary" @click="reset" icon="reload" style="margin-left: 8px">重置</a-button>
-            </span>
-             </a-col>
-           </a-row>
-         </a-form>
-       </div>
-         <div>
-           <a-table
-             ref="table"
-             size="middle"
-             :scroll="{x:true}"
-             bordered
-             rowKey="id"
-             :columns="columns"
-             :dataSource="dataSource"
-             :pagination="ipagination"
-             :loading="loading"
-             class="j-table-force-nowrap"
-             @change="handleTableChange">
+           </template>
+         </a-card>
+       </a-col>-->
+       <!--<a-col :span="8">
+         <a-card title="Card title" :bordered="false">
+           <p>card content</p>
+         </a-card>
+       </a-col>-->
+     </a-row>
+   </div>
+   <!--          <div>
+               <a-row>
+                 <a-col :span="8">
+                   <a-card title="稽核历史" style="width: 500px" :bordered="true">
+                     <template #extra><a href="#">更多>></a></template>
+                     <p>22-07-06 09:27 张文超提交了资料</p>
+                     <p>22-07-05 08:26 张文超提交了资料</p>
+                     <p>22-07-05 08:24 张文超提交了的资料</p>
+                   </a-card>
+                 </a-col>
+                 <a-col :span="8">
+                   <a-card title="稽核目标" style="width: 300px" :bordered="true">
+                     <a-descriptions  :column="1" :bordered="true">
+                       <a-descriptions-item label="总数">50</a-descriptions-item>
+                       <a-descriptions-item label="未完善">5</a-descriptions-item>
+                       <a-descriptions-item label="待稽核">10</a-descriptions-item>
+                       <a-descriptions-item label="待整改">15</a-descriptions-item>
+                       <a-descriptions-item label="通过">20</a-descriptions-item>
+                     </a-descriptions>
+                   </a-card>
+                 </a-col>
+               </a-row>
 
-             <span slot="action" slot-scope="text, record">
-               <a @click="showCheckCheck(record)">查看资料</a>
-             </span>
 
-             <template v-slot:checkState="status">
-               <a-badge :status="status | statusTypeFilter" :text="status | statusFilter"/>
-             </template>
-           </a-table>
-         </div>
-     </a-card>
-   </div>
+             </div>-->
 </template>
 <script>
 
 import '@/assets/less/TableExpand.less'
-import {getAction} from "@api/manage";
 import {JeecgListMixin} from "@/mixins/JeecgListMixin";
 import {mixinDevice} from "@/utils/mixin";
-
 export default {
   name: 'CompanyCheckDetail',
-  mixins: [JeecgListMixin, mixinDevice],
   components: {
   },
-  props: {
-    taskInfo: {
-      type: Object,
-      require: true
-    },
-  },
-  filters: {
-    statusTypeFilter(type) {
-      const statusTypeMap = {
-        '0': 'error',
-        '1': 'error',
-        '2': 'warning',
-        '3': 'warning',
-        '4': 'processing',
-        '5': 'success'
-      }
-      return statusTypeMap[type]
-    },
-    statusFilter(status) {
-      const statusMap = {
-        '0': '未完善',
-        '1': '未完善',
-        '2': '待稽核',
-        '3': '待稽核',
-        '4': '待整改',
-        '5': '通过'
-      }
-      return statusMap[status]
-    }
-  },
   data () {
     return {
-      description: '服务列表',
+      description: '稽核任务扩展',
       // 表头
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          width: 60,
-          align: "center",
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1;
-          }
-        },
-        {
-          title: '客户编号',
-          align: "center",
-          dataIndex: 'customerNo'
-        },
-        {
-          title: '用户编号',
-          align: "center",
-          dataIndex: 'userNo'
-        },
-        /*{
-          title: '客户名称',
-          align: "center",
-          dataIndex: 'customerName'
-        },*/
-        {
-          title: '用户发展员工',
-          align: "center",
-          dataIndex: 'staffName'
-        },
-        {
-          title: '入网时间',
-          align: "center",
-          dataIndex: 'networkAccessTime'
-        },
-        {
-          title: '服务号码',
-          align: "center",
-          dataIndex: 'smsNumber'
-        },
-        {
-          title: '资料状态',
-          align: "center",
-          dataIndex: 'checkState',
-          scopedSlots: {customRender: 'checkState'}
-        },
-        {
-          title: '操作',
-          dataIndex: 'action',
-          align: "center",
-          fixed: "right",
-          width: 147,
-          scopedSlots: {customRender: 'action'}
-        }
-      ],
-      labelCol: { span: 1 },
-      wrapperCol: { span: 23 },
-      dictOptions:{},
-      superFieldList:[],
-      url: {
-        list: "/smsCheck/customerInfo/staff/list",
-      },
-      queryParam:{},
-      queryParam1:{}
+      toggleSearchStatus1:false,
+      toggleSearchStatus2:false,
     }
   },
   created() {
     this.init();
   },
   methods: {
-    showTaskList(){
-      this.$emit("goTaskList",this.taskInfo)
-    },
-    showCheckCheck(record){
-      this.taskInfo.info=record
-
-      this.$emit("goCheckCheck",this.taskInfo)
-    },
-    query(){
-      this.init();
-    },
-    reset(){
-      this.queryParam.smsNumber='';
-      this.init();
-    },
-    init(){
-      this.queryParam.customerNo=this.taskInfo.info.customerNo;
-      this.queryParam.taskId=this.taskInfo.task.id;
-      getAction("/smsCheck/customerInfo/list",this.queryParam).then(resp=>{
-        if(resp.success){
-          this.dataSource=resp.result.records
-        }
-      })
+    handleToggleSearch1(){
+      this.toggleSearchStatus1 = !this.toggleSearchStatus1;
+    },handleToggleSearch2(){
+      this.toggleSearchStatus2 = !this.toggleSearchStatus2;
     },
   }
 }

src/views/company/CompanyList.vue

@@ -58,7 +58,7 @@ import {getAction} from "@api/manage";
 
 export default {
   name: 'CompanyList',
-  mixins:[JeecgListMixin, mixinDevice],
+  mixins:[JeecgListMixin],
   components: {
     SmsCheckWorkLogModal
   },
@@ -96,23 +96,19 @@ export default {
           scopedSlots: { customRender: 'customerName' }
         },
         {
-          title:'客户电话',
+          title:'入网时间',
           align:"center",
-          dataIndex: 'customerNumber',
-        }, {
-          title:'客户邮箱',
-          align:"center",
-          dataIndex: 'customerEmail',
+          dataIndex: 'networkAccessTime',
         },
         {
-          title:'单位地址',
+          title:'客户经理',
           align:"center",
-          dataIndex: 'customerAdress',
+          dataIndex: 'accountManager',
         },
         {
-          title:'公司简介',
+          title:'经理电话',
           align:"center",
-          dataIndex: 'customerDescription',
+          dataIndex: 'accountManagerPhone',
         },
       ],
       url: {

src/views/company/CompanyMain.vue

@@ -9,17 +9,17 @@
       <!-- 任务页 -->
       <company-task-list v-if="showType==='taskList'"
                           :taskInfo="taskInfo"
-                          @goCheckDetail="showCheckDetail"
+                         @goCheckCheck="showCheckCheck"
                           @goCompany="showCompany"/>
       <!-- 稽核详情 -->
-      <company-check-detail v-if="showType==='checkdetail'"
+<!--      <company-check-detail v-if="showType==='checkdetail'"
                             :taskInfo="taskInfo"
                             @goCheckCheck="showCheckCheck"
-                            @goTaskList="showTaskList"/>
+                            @goTaskList="showTaskList"/>-->
       <!--  稽核资料 -->
       <company-check-check v-if="showType==='checkcheck'"
                            :taskInfo="taskInfo"
-                           @goCheckDetail="showCheckDetail"/>
+                           @goTaskList="showTaskList"/>
     </div>
   </div>
 </template>

src/views/company/CompanyTaskList.vue

@@ -2,33 +2,66 @@
   <div>
     <a-page-header
       style="background-color: #FFFFFF;"
-      title="行短稽核-客户信息"
+      :title="taskInfo.info.customerName"
       sub-title=""
       @back="showTaskList"
     >
-     <a-descriptions :title="taskInfo.info.customerName" :column="3" :bordered="false">
-       <a-descriptions-item label="客户编号">{{taskInfo.info.customerNo}}</a-descriptions-item>
-       <a-descriptions-item label="客户电话">{{taskInfo.info.customerNumber}}</a-descriptions-item>
-       <a-descriptions-item label="客户邮箱">{{taskInfo.info.customerEmail}}</a-descriptions-item>
-       <a-descriptions-item label="客户状态" >{{taskInfo.info.customerState}}</a-descriptions-item>
-       <a-descriptions-item label="单位地址" :span="2">{{taskInfo.info.customerAdress}}</a-descriptions-item>
-       <a-descriptions-item label="单位简介" :span="2">{{taskInfo.info.customerDescription}}</a-descriptions-item>
-      </a-descriptions>
+      <!--  基本信息  -->
+      <a-card :bordered="false" title="客户信息" style="margin-top: 10px;">
+        <a-descriptions  :column="2" :bordered="true">
+          <a-descriptions-item label="客户编号">{{taskInfo.info.customerNo}}</a-descriptions-item>
+          <a-descriptions-item label="入网时间" >{{taskInfo.info.networkAccessTime}}</a-descriptions-item>
+          <a-descriptions-item label="客户经理">{{taskInfo.info.accountManager}}</a-descriptions-item>
+          <a-descriptions-item label="经理电话" >{{taskInfo.info.accountManagerPhone}}</a-descriptions-item>
+        </a-descriptions>
+      </a-card>
+      <!--   服务列表   -->
+      <a-card :bordered="false" title="服务列表" style="margin-top: 10px;">
+
+        <div>
+          <a-table
+            ref="table"
+            size="middle"
+            :scroll="{x:true}"
+            bordered
+            rowKey="id"
+            :columns="columns"
+            :dataSource="dataSource"
+            :pagination="ipagination"
+            :loading="loading"
+            class="j-table-force-nowrap"
+            @change="handleTableChange">
+
+             <span slot="action" slot-scope="text, record">
+               <a @click="showCheckCheck(record)">查看</a>
+             </span>
+
+            <template v-slot:checkState="status">
+              <a-badge :status="status | statusTypeFilter" :text="status | statusFilter"/>
+            </template>
+          </a-table>
+        </div>
+      </a-card>
     </a-page-header>
+
     <a-card :bordered="false" title="稽核任务" style="margin-top: 10px;">
       <a-form-model
         ref="ruleForm"
         :label-col="labelCol"
         :wrapper-col="wrapperCol"
       >
-        <a-card :bordered="false" v-for="task in taskCheckInfo">
-          <a-descriptions  bordered >
-            <a-descriptions-item label="任务名称"><a @click="showCheckDetail(task)">{{task.taskName}}</a></a-descriptions-item>
-            <a-descriptions-item label="开始时间">{{task.taskStartTime}}</a-descriptions-item>
-            <a-descriptions-item label="结束时间">{{task.taskEndTime}}</a-descriptions-item>
-            <a-descriptions-item label="任务状态">{{task.taskState_dictText}}</a-descriptions-item>
-            <a-descriptions-item label="任务描述" :span="2">{{task.description}}</a-descriptions-item>
+        <a-card :bordered="false" v-for="(taskCheck,taskindex) in taskCheckInfo" :key="taskindex">
+          <a-descriptions  :bordered="true" >
+            <a-descriptions-item label="任务名称">{{taskCheck.taskName}}</a-descriptions-item>
+            <a-descriptions-item label="开始时间">{{taskCheck.taskStartTime}}</a-descriptions-item>
+            <a-descriptions-item label="结束时间">{{taskCheck.taskEndTime}}</a-descriptions-item>
+            <a-descriptions-item label="任务状态">{{taskCheck.taskState_dictText}}</a-descriptions-item>
+            <a-descriptions-item label="任务描述" :span="2">{{taskCheck.description}}</a-descriptions-item>
           </a-descriptions>
+
+          <!--  稽核任务动态  -->
+          <company-check-detail/>
+
         </a-card>
       </a-form-model>
     </a-card>
@@ -38,8 +71,11 @@
 import CompanyCheckCheck from "@views/company/CompanyCheckCheck";
 import CompanyCheckDetail from "@views/company/CompanyCheckDetail";
 import {getAction} from "@api/manage";
+import {JeecgListMixin} from "@/mixins/JeecgListMixin";
+import {mixinDevice} from "@/utils/mixin";
 export default {
   name: 'CompanyTaskList',
+  mixins: [JeecgListMixin,mixinDevice],
   components: {
     CompanyCheckCheck,
     CompanyCheckDetail
@@ -50,41 +86,130 @@ export default {
       require: true
     }
   },
+  filters: {
+    statusTypeFilter(type) {
+      const statusTypeMap = {
+        '0': 'error',
+        '1': 'error',
+        '2': 'warning',
+        '3': 'warning',
+        '4': 'processing',
+        '5': 'success'
+      }
+      return statusTypeMap[type]
+    },
+    statusFilter(status) {
+      const statusMap = {
+        '0': '未完善',
+        '1': '未完善',
+        '2': '待稽核',
+        '3': '待稽核',
+        '4': '待整改',
+        '5': '通过'
+      }
+      return statusMap[status]
+    }
+  },
   data(){
     return{
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: "center",
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1;
+          }
+        },
+        {
+          title: '服务号码',
+          align: "center",
+          dataIndex: 'smsNumber'
+        },
+
+        {
+          title: '用户编号',
+          align: "center",
+          dataIndex: 'userNo'
+        },
+        {
+          title: '入网时间',
+          align: "center",
+          dataIndex: 'networkAccessTime'
+        },
+        {
+          title: '用户状态',
+          align: "center",
+          dataIndex: 'userState'
+        },
+        {
+          title: '用户发展员工',
+          align: "center",
+          dataIndex: 'staffName'
+        },
+        {
+          title: '资料状态',
+          align: "center",
+          dataIndex: 'checkState',
+          scopedSlots: {customRender: 'checkState'}
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: "center",
+          fixed: "right",
+          width: 147,
+          scopedSlots: {customRender: 'action'}
+        }
+      ],
       description: '稽核业务列表',
       labelCol: { span: 1 },
       wrapperCol: { span: 23 },
       taskCheckInfo:{},
-      showType:'checktask'
+      showType:'checktask',
+      url: {
+        list: "/smsCheck/customerInfo/staff/list",
+      },
+      showHistory:''
     }
   },
   created() {
-      this.init()
+    this.initTable();
+    this.init()
   },
   methods:{
     init(){
-      let queryParam={
+      let queryList={
         customerNo:this.taskInfo.info.customerNo,
         customerName:this.taskInfo.info.customerName
       }
-      getAction("/smsCheck/customerInfo/selectTaskList",queryParam).then(resp=>{
+      getAction("/smsCheck/customerInfo/selectTaskList",queryList).then(resp=>{
         if(resp.success){
           this.taskCheckInfo=resp.result.records
         }
       })
     },
+    initTable(){
+      let queryTable={
+        customerNo:this.taskInfo.info.customerNo,
+        /*taskId:this.taskInfo.task.id*/
+      }
+      getAction("/smsCheck/customerInfo/list",queryTable).then(resp=>{
+        if(resp.success){
+          this.dataSource=resp.result.records
+        }
+      })
+    },
     showTaskList(){
       let taskInfo = Object.assign({}, this.task);
       this.$emit("goCompany",taskInfo)
     },
-    showCheckTask(){
-      this.showType = "checktask"
+    showCheckCheck(record){
+      this.taskInfo.info=record
+      this.$emit("goCheckCheck",this.taskInfo)
     },
-    showCheckDetail(record){
-      this.taskInfo.task=record
-      this.$emit("goCheckDetail",this.taskInfo)
-    }
   }
 }