将页面跳转相关内容改成路由

src/views/dashboard/IndexChart2.vue

@@ -49,6 +49,10 @@
             </template>
             <template v-else>
               <a-table :dataSource="subTaskWorkList" size="small" rowKey="index" :columns="subTaskWorkColumns" :pagination="false">
+
+                <template v-slot:taskCheck="text, record">
+                  <a @click="taskCheckLeader(record)">稽核</a>
+                </template>
               </a-table>
             </template>
 
@@ -93,7 +97,7 @@
             </template>
             <template v-else>
               <a-timeline>
-                <a-timeline-item v-for="recent in recentInfoList">{{recent.createTime}} {{recent.realname}}稽核了【{{recent.customerName}}】的资料</a-timeline-item>
+                <a-timeline-item v-for="(recent,index) in recentInfoList" :key="index">{{recent.createTime}} {{recent.realname}}稽核了【{{recent.customerName}}】的资料</a-timeline-item>
               </a-timeline>
             </template>
           </a-card>
@@ -107,6 +111,10 @@
             </template>
             <template v-else>
               <a-table :dataSource="subTaskInfoList" size="small" rowKey="index" :columns="subTaskInfoColumns" :pagination="false">
+                <template v-slot:taskCheck="text, record">
+                  <a @click="taskCheckManager(record)">完善</a>
+                </template>
+
               </a-table>
             </template>
 
@@ -249,8 +257,8 @@
         targetWorkObj: [],
         recentInfoList: [],
         subTaskInfoList: [],
+        isFirst: true,
         targetInfoObj: [],
-        dataSource2:[],
         mainTaskList: [],
         selectedRowKeys: [],
         columns:[
@@ -308,9 +316,7 @@
             title: '操作',
             align:"left",
             dataIndex: 'op',
-            customRender: function (text,record) {
-              return <a>稽核</a>
-            }
+            scopedSlots: { customRender: 'taskCheck' }
           }
         ],
         subTaskInfoColumns:[
@@ -326,9 +332,7 @@
             title: '操作',
             align:"left",
             dataIndex: 'op',
-            customRender: function (text,record) {
-              return <a>完善</a>
-            }
+            scopedSlots: { customRender: 'taskCheck' }
           }
         ],
         taskColumns:[
@@ -407,12 +411,10 @@
               that.isManager = res.result.isManager;
               if(that.mainTaskList && that.mainTaskList.length > 0) {
                 that.taskId = that.mainTaskList[0].id;
-                that.selectedRowKeys = [that.taskId];
-                // 管理员
-                if (that.isManager) {
-                  that.getWorkList(that.taskId);
+                if (that.selectedRowKeys.length === 0) {
+                  that.getWorkOrInfoList(null);
                 } else {
-                  that.getInfoList(that.taskId);
+                  that.getWorkOrInfoList(that.taskId);
                 }
               }
 
@@ -467,11 +469,19 @@
         this.$router.push({ path: '/isps/userAnnouncement' })
       },
       showMoreTask() {
-        this.$router.push({ path: '/smscheck/task/main' })
+        this.$router.push({ path: '/sms/check/task' })
+      },
+      taskCheckLeader(record) {
+        this.$router.push({ path: '/sms/check/task/check/check', query: { id: record.id} })
+      },
+      taskCheckManager(record) {
+        this.$router.push({ path: '/dataupload/data/main', query: { id: record.id} })
       },
       onSelectChange(selectedRowKeys, selectionRows) {
         this.selectedRowKeys = selectedRowKeys;
         this.selectionRows = selectionRows;
+        this.taskId = selectedRowKeys[0];
+        this.getWorkOrInfoList(this.taskId);
       },
       customRow(record, index) {
         let that = this;
@@ -479,18 +489,25 @@
           on: {
             // 鼠标单击行
             click: (event) => {
-              that.taskId = record.id;
               that.selectedRowKeys = [record.id];
-              if (that.isManager) {
-                that.getWorkList(that.taskId);
-              } else {
-                that.getInfoList(that.taskId);
+              let taskId = record.id;
+              // 和上次点击的不一样时
+              if (that.taskId !== taskId) {
+                that.taskId = record.id;
+                that.getWorkOrInfoList(taskId);
               }
             },
           }
         }
-
       },
+      // 根据用户的角色获取对应的数据
+      getWorkOrInfoList(taskId) {
+        if (this.isManager) {
+          this.getWorkList(taskId);
+        } else {
+          this.getInfoList(taskId);
+        }
+      }
     }
   }
 </script>

src/views/smscheck/modules/TaskCheckCheck.vue

@@ -3,18 +3,18 @@
   <div>
     <a-page-header
       style="background-color: #FFFFFF;"
-      title="稽核详情-客户详情"
+      title="资料稽核"
       sub-title=""
       @back="showCheckList"
     >
-      <a-descriptions :title="checkInfo.info.customerName" :column="3" :bordered="false">
-        <a-descriptions-item label="客户编号">{{checkInfo.info.customerNo}}</a-descriptions-item>
-        <a-descriptions-item label="服务号码">{{checkInfo.info.smsNumber}}</a-descriptions-item>
-        <a-descriptions-item label="用户编号">{{checkInfo.info.userNo}}</a-descriptions-item>
-        <a-descriptions-item label="入网时间">{{checkInfo.info.networkAccessTime}}</a-descriptions-item>
-        <a-descriptions-item label="用户状态" :span="2">{{checkInfo.info.userState}}</a-descriptions-item>
-        <a-descriptions-item label="员工姓名">{{checkInfo.info.staffName}}</a-descriptions-item>
-        <a-descriptions-item label="员工工号">{{checkInfo.info.staffNo}}</a-descriptions-item>
+      <a-descriptions :title="info.customerName" :column="3" :bordered="false">
+        <a-descriptions-item label="客户编号">{{info.customerNo}}</a-descriptions-item>
+        <a-descriptions-item label="服务号码">{{info.smsNumber}}</a-descriptions-item>
+        <a-descriptions-item label="用户编号">{{info.userNo}}</a-descriptions-item>
+        <a-descriptions-item label="入网时间">{{info.networkAccessTime}}</a-descriptions-item>
+        <a-descriptions-item label="用户状态" :span="2">{{info.userState}}</a-descriptions-item>
+        <a-descriptions-item label="员工姓名">{{info.staffName}}</a-descriptions-item>
+        <a-descriptions-item label="员工工号">{{info.staffNo}}</a-descriptions-item>
       </a-descriptions>
     </a-page-header>
 
@@ -28,13 +28,13 @@
       >
         <a-card title="业务基本情况内容" :bordered="true">
           <a-descriptions :bordered="false">
-            <a-descriptions-item label="用户开通状态">{{checkInfo.info.userOpenState}}</a-descriptions-item>
-            <a-descriptions-item label="码号" :span="2">{{checkInfo.info.smsNumberPrefix}}</a-descriptions-item>
-            <a-descriptions-item label="详细用途" :span="3">{{checkInfo.info.smsNumberUsage}}</a-descriptions-item>
-            <a-descriptions-item label="使用单位联系人">{{checkInfo.info.customerContacts}}</a-descriptions-item>
-            <a-descriptions-item label="手机号" :span="2">{{checkInfo.info.customerContactsPhone}}</a-descriptions-item>
-            <a-descriptions-item label="客户经理">{{checkInfo.info.accountManager}}</a-descriptions-item>
-            <a-descriptions-item label="手机号" :span="2">{{checkInfo.info.accountManagerPhone}}</a-descriptions-item>
+            <a-descriptions-item label="用户开通状态">{{info.userOpenState}}</a-descriptions-item>
+            <a-descriptions-item label="码号" :span="2">{{info.smsNumberPrefix}}</a-descriptions-item>
+            <a-descriptions-item label="详细用途" :span="3">{{info.smsNumberUsage}}</a-descriptions-item>
+            <a-descriptions-item label="使用单位联系人">{{info.customerContacts}}</a-descriptions-item>
+            <a-descriptions-item label="手机号" :span="2">{{info.customerContactsPhone}}</a-descriptions-item>
+            <a-descriptions-item label="客户经理">{{info.accountManager}}</a-descriptions-item>
+            <a-descriptions-item label="手机号" :span="2">{{info.accountManagerPhone}}</a-descriptions-item>
           </a-descriptions>
           <a-form-model-item label="稽核状态" prop="basicCheckState">
             <a-radio-group v-model="model.basicCheckState">
@@ -53,15 +53,15 @@
 
         <a-card title="业务规范性内容" :bordered="true">
           <a-descriptions :bordered="false">
-            <a-descriptions-item label="合同到期时间">{{checkInfo.info.contractExpireTime}}</a-descriptions-item>
-            <a-descriptions-item label="码号证书到期时间">{{checkInfo.info.smsNumberCertificateExpireTime}}</a-descriptions-item>
-            <a-descriptions-item label="备案通知到期时间">{{checkInfo.info.recordNoticeExpireTime}}</a-descriptions-item>
-            <a-descriptions-item label="增值业务许可证到期时间">{{checkInfo.info.valueAddedLicenceExpireTime}}</a-descriptions-item>
-            <a-descriptions-item label="营业执照到期时间" :span="2">{{checkInfo.info.businessLicenceExpireTime}}</a-descriptions-item>
-            <a-descriptions-item label="合同签署主体与实际开通客户是否一致">{{checkInfo.info.contractOpenCustomerSame}}</a-descriptions-item>
-            <a-descriptions-item label="是否有集团价格审批" :span="2">{{checkInfo.info.groupPriceApproval}}</a-descriptions-item>
-            <a-descriptions-item label="资料是否完整">{{checkInfo.info.dataComplete}}</a-descriptions-item>
-            <a-descriptions-item label="是否完成整改">{{checkInfo.info.rectifyReformOver}}</a-descriptions-item>
+            <a-descriptions-item label="合同到期时间">{{info.contractExpireTime}}</a-descriptions-item>
+            <a-descriptions-item label="码号证书到期时间">{{info.smsNumberCertificateExpireTime}}</a-descriptions-item>
+            <a-descriptions-item label="备案通知到期时间">{{info.recordNoticeExpireTime}}</a-descriptions-item>
+            <a-descriptions-item label="增值业务许可证到期时间">{{info.valueAddedLicenceExpireTime}}</a-descriptions-item>
+            <a-descriptions-item label="营业执照到期时间" :span="2">{{info.businessLicenceExpireTime}}</a-descriptions-item>
+            <a-descriptions-item label="合同签署主体与实际开通客户是否一致">{{info.contractOpenCustomerSame}}</a-descriptions-item>
+            <a-descriptions-item label="是否有集团价格审批" :span="2">{{info.groupPriceApproval}}</a-descriptions-item>
+            <a-descriptions-item label="资料是否完整">{{info.dataComplete}}</a-descriptions-item>
+            <a-descriptions-item label="是否完成整改">{{info.rectifyReformOver}}</a-descriptions-item>
           </a-descriptions>
 
           <a-form-model-item label="稽核状态" prop="standardCheckState">
@@ -198,33 +198,6 @@
             </a-row>
           </div>
 
-<!--          <a-descriptions :column="1" :bordered="false">
-            <a-descriptions-item label="业务合同">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-            <a-descriptions-item label="号码证书">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-            <a-descriptions-item label="备案通知">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-            <a-descriptions-item label="集团政企价格审批单">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-            <a-descriptions-item label="营业执照" :span="2">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-            <a-descriptions-item label="客户介绍信">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-            <a-descriptions-item label="经办人身份证复印件">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-            <a-descriptions-item label="在CRM没有行短业务的截图">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-          </a-descriptions>-->
-
           <a-form-model-item label="稽核状态" prop="dataCheckState">
             <a-radio-group v-model="model.dataCheckState">
               <a-radio :value="1">未通过</a-radio>
@@ -270,12 +243,7 @@ let Base64 = require('js-base64').Base64
 export default {
   name: 'TaskCheckCheck',
   mixins:[JeecgListMixin],
-  props: {
-    checkInfo: {
-      type: Object,
-      require: true
-    }
-  },
+  inject:['closeCurrent'],
   data () {
     return {
       description: '稽核详情页面',
@@ -302,15 +270,12 @@ export default {
         ],
       },
       url: {
+        queryInfo: "/smsCheck/customerInfo/queryById",
         list: "/smsCheck/customerInfo/list",
         check: "/smsCheck/customerInfo/checkInfo",
         listData: "/smsCheck/customerData/list"
       },
       autoSearch: false,
-      fileList: [
-        {text: '附件', url: "http://202.85.214.182:9001/default/by2_1650088480055.jpg"},
-        {text: '附件', url: "http://202.85.214.182:9001/default/《Nginx代理系统常用手册》电子书_1650129698991.pdf"}
-      ],
       radioValue: "businessContract",
       fileTypeBadge: {
         "businessContract": {
@@ -389,10 +354,13 @@ export default {
         valueAddedLicence: "valueAddedLicence"
       },
       delList:[],
-
+      info: {},
     }
   },
   created() {
+    this.info.id = this.$route.query.id;
+    this.queryInfoById(this.info.id);
+
     this.customerDataList();
     this.badgeCount()
   },
@@ -403,7 +371,7 @@ export default {
 
     customerDataList() {
       let model = {
-        "infoId": this.checkInfo.info.id
+        "infoId": this.info.id
       }
       httpAction(this.url.listData, model, "post")
         .then((res) => {
@@ -445,7 +413,7 @@ export default {
     badgeCount() {
       //this.fileTypeBadge = []
       let model = {
-        "infoId": this.checkInfo.info.id
+        "infoId": this.info.id
       }
       httpAction(this.url.listData, model, "post")
         .then((res) => {
@@ -471,7 +439,6 @@ export default {
                   }
                   this.fileTypeBadge[fileTypeElement] = badge;
                 }
-                console.log(this.fileTypeBadge)
 
               }
 
@@ -492,15 +459,10 @@ export default {
         })
     },
 
-
-    // 显示列表页面
-    showList() {
-      this.$emit('goList');
-    },
     // 显示列表页面
     showCheckList() {
-      let taskInfo = this.checkInfo.task;
-      this.$emit('goCheckList', taskInfo);
+      this.$router.go(-1);
+      this.closeCurrent();
     },
     // 显示列表页面
     submit() {
@@ -510,11 +472,11 @@ export default {
         // 验证通过
         if (valid) {
 
-          that.model.taskId = that.checkInfo.task.id;
-          that.model.infoId = that.checkInfo.info.id;
-          that.model.customerNo = that.checkInfo.info.customerNo;
-          that.model.customerName = that.checkInfo.info.customerName;
-          that.model.staffNo = that.checkInfo.info.staffNo;
+          // that.model.taskId = that.checkInfo.task.id;
+          that.model.infoId = that.info.id;
+          that.model.customerNo = that.info.customerNo;
+          that.model.customerName = that.info.customerName;
+          that.model.staffNo = that.info.staffNo;
 
           let httpUrl = this.url.check;
           let method = 'post';
@@ -532,18 +494,34 @@ export default {
             that.confirmLoading = false;
           })
 
-          let taskInfo = this.checkInfo.task;
-          that.$emit('goCheckList', taskInfo);
+          // let taskInfo = this.checkInfo.task;
+          // that.$emit('goCheckList', taskInfo);
+          that.showCheckList();
         } else {
           that.$message.warning('请检查必填项！');
         }
       });
     },
-    handlePreview(record) {
-      if (record && record.url) {
-        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(Base64.encode((record.url)))
-        return url;
+    handlePreview(path) {
+      let url = path;
+      if (path) {
+        url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(Base64.encode((path)))
+      }
+      return url;
+    },
+    queryInfoById (id) {
+      let url = this.url.queryInfo;
+      let params = {
+        id: id
       }
+      let that = this;
+      getAction(url, params).then(res => {
+        if (res.success) {
+          that.info = res.result;
+        }
+      }).finally(() => {
+
+      })
     },
   }
 }

src/views/smscheck/modules/TaskCheckDetail.vue

@@ -3,51 +3,51 @@
   <div>
     <a-page-header
       style="background-color: #FFFFFF;"
-      title="稽核详情-客户详情"
+      title="客户详情"
       sub-title=""
       @back="showCheckList"
     >
-      <a-descriptions :title="checkInfo.info.customerName" :column="3" :bordered="false">
-        <a-descriptions-item label="客户编号">{{checkInfo.info.customerNo}}</a-descriptions-item>
-        <a-descriptions-item label="服务号码">{{checkInfo.info.smsNumber}}</a-descriptions-item>
-        <a-descriptions-item label="用户编号">{{checkInfo.info.userNo}}</a-descriptions-item>
-        <a-descriptions-item label="入网时间">{{checkInfo.info.networkAccessTime}}</a-descriptions-item>
-        <a-descriptions-item label="用户状态" :span="2">{{checkInfo.info.userState}}</a-descriptions-item>
-        <a-descriptions-item label="员工姓名">{{checkInfo.info.staffName}}</a-descriptions-item>
-        <a-descriptions-item label="员工工号">{{checkInfo.info.staffNo}}</a-descriptions-item>
+      <a-descriptions :title="info.customerName" :column="3" :bordered="false">
+        <a-descriptions-item label="客户编号">{{info.customerNo}}</a-descriptions-item>
+        <a-descriptions-item label="服务号码">{{info.smsNumber}}</a-descriptions-item>
+        <a-descriptions-item label="用户编号">{{info.userNo}}</a-descriptions-item>
+        <a-descriptions-item label="入网时间">{{info.networkAccessTime}}</a-descriptions-item>
+        <a-descriptions-item label="用户状态" :span="2">{{info.userState}}</a-descriptions-item>
+        <a-descriptions-item label="员工姓名">{{info.staffName}}</a-descriptions-item>
+        <a-descriptions-item label="员工工号">{{info.staffNo}}</a-descriptions-item>
       </a-descriptions>
     </a-page-header>
 
     <a-card :bordered="false" style="margin-top: 10px;">
       <a-form-model
         ref="ruleForm"
-        :label-col="labelCol"
-        :wrapper-col="wrapperCol"
+        :label-col="{ span: 1 }"
+        :wrapper-col="{ span: 23 }"
       >
         <a-card title="业务基本情况内容" :bordered="true">
           <a-descriptions :bordered="false">
-            <a-descriptions-item label="用户开通状态">{{checkInfo.info.userOpenState}}</a-descriptions-item>
-            <a-descriptions-item label="码号" :span="2">{{checkInfo.info.smsNumberPrefix}}</a-descriptions-item>
-            <a-descriptions-item label="详细用途" :span="3">{{checkInfo.info.smsNumberUsage}}</a-descriptions-item>
-            <a-descriptions-item label="使用单位联系人">{{checkInfo.info.customerContacts}}</a-descriptions-item>
-            <a-descriptions-item label="手机号" :span="2">{{checkInfo.info.customerContactsPhone}}</a-descriptions-item>
-            <a-descriptions-item label="客户经理">{{checkInfo.info.accountManager}}</a-descriptions-item>
-            <a-descriptions-item label="手机号" :span="2">{{checkInfo.info.accountManagerPhone}}</a-descriptions-item>
+            <a-descriptions-item label="用户开通状态">{{info.userOpenState}}</a-descriptions-item>
+            <a-descriptions-item label="码号" :span="2">{{info.smsNumberPrefix}}</a-descriptions-item>
+            <a-descriptions-item label="详细用途" :span="3">{{info.smsNumberUsage}}</a-descriptions-item>
+            <a-descriptions-item label="使用单位联系人">{{info.customerContacts}}</a-descriptions-item>
+            <a-descriptions-item label="手机号" :span="2">{{info.customerContactsPhone}}</a-descriptions-item>
+            <a-descriptions-item label="客户经理">{{info.accountManager}}</a-descriptions-item>
+            <a-descriptions-item label="手机号" :span="2">{{info.accountManagerPhone}}</a-descriptions-item>
           </a-descriptions>
 
         </a-card>
 
         <a-card title="业务规范性内容" :bordered="true">
           <a-descriptions :bordered="false">
-            <a-descriptions-item label="合同到期时间">{{checkInfo.info.contractExpireTime}}</a-descriptions-item>
-            <a-descriptions-item label="码号证书到期时间">{{checkInfo.info.smsNumberCertificateExpireTime}}</a-descriptions-item>
-            <a-descriptions-item label="备案通知到期时间">{{checkInfo.info.recordNoticeExpireTime}}</a-descriptions-item>
-            <a-descriptions-item label="增值业务许可证到期时间">{{checkInfo.info.valueAddedLicenceExpireTime}}</a-descriptions-item>
-            <a-descriptions-item label="营业执照到期时间" :span="2">{{checkInfo.info.businessLicenceExpireTime}}</a-descriptions-item>
-            <a-descriptions-item label="合同签署主体与实际开通客户是否一致">{{checkInfo.info.contractOpenCustomerSame}}</a-descriptions-item>
-            <a-descriptions-item label="是否有集团价格审批" :span="2">{{checkInfo.info.groupPriceApproval}}</a-descriptions-item>
-            <a-descriptions-item label="资料是否完整">{{checkInfo.info.dataComplete}}</a-descriptions-item>
-            <a-descriptions-item label="是否完成整改" :span="2">{{checkInfo.info.rectifyReformOver}}</a-descriptions-item>
+            <a-descriptions-item label="合同到期时间">{{info.contractExpireTime}}</a-descriptions-item>
+            <a-descriptions-item label="码号证书到期时间">{{info.smsNumberCertificateExpireTime}}</a-descriptions-item>
+            <a-descriptions-item label="备案通知到期时间">{{info.recordNoticeExpireTime}}</a-descriptions-item>
+            <a-descriptions-item label="增值业务许可证到期时间">{{info.valueAddedLicenceExpireTime}}</a-descriptions-item>
+            <a-descriptions-item label="营业执照到期时间" :span="2">{{info.businessLicenceExpireTime}}</a-descriptions-item>
+            <a-descriptions-item label="合同签署主体与实际开通客户是否一致">{{info.contractOpenCustomerSame}}</a-descriptions-item>
+            <a-descriptions-item label="是否有集团价格审批" :span="2">{{info.groupPriceApproval}}</a-descriptions-item>
+            <a-descriptions-item label="资料是否完整">{{info.dataComplete}}</a-descriptions-item>
+            <a-descriptions-item label="是否完成整改" :span="2">{{info.rectifyReformOver}}</a-descriptions-item>
 
           </a-descriptions>
 
@@ -174,34 +174,6 @@
             </a-row>
           </div>
 
-<!--          <a-descriptions :column="1" :bordered="false">
-            <a-descriptions-item label="业务合同" :span="2">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-            <a-descriptions-item label="号码证书" :span="2">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-            <a-descriptions-item label="备案通知" :span="2">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-            <a-descriptions-item label="集团政企价格审批单" :span="2">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-            <a-descriptions-item label="营业执照" :span="2">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-            <a-descriptions-item label="客户介绍信" :span="2">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-            <a-descriptions-item label="经办人身份证复印件" :span="2">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-            <a-descriptions-item label="在CRM没有行短业务的截图" :span="2">
-              <a-space><a v-for="(file,index) in fileList" :href="handlePreview(file)" target="_blank">{{'附件' + (index + 1)}}</a></a-space>
-            </a-descriptions-item>
-
-          </a-descriptions>-->
-
         </a-card>
 
         <a-form-model-item :wrapper-col="{ span: 14, offset: 4 }" style="margin-top: 10px;">
@@ -230,12 +202,7 @@ let Base64 = require('js-base64').Base64
 export default {
   name: 'TaskCheckDetail',
   mixins:[JeecgListMixin],
-  props: {
-    checkInfo: {
-      type: Object,
-      require: true
-    }
-  },
+  inject:['closeCurrent'],
   data () {
     return {
       delList:[],
@@ -317,20 +284,19 @@ export default {
         },
       },
       description: '稽核详情页面',
-      labelCol: { span: 1 },
-      wrapperCol: { span: 23 },
+      info: {},
       url: {
+        queryInfo: "/smsCheck/customerInfo/queryById",
         list: "/smsCheck/customerInfo/list",
         listData: "/smsCheck/customerData/list"
       },
       autoSearch: false,
-      fileList: [
-        {text: '附件', url: "http://202.85.214.182:9001/default/by2_1650088480055.jpg"},
-        {text: '附件', url: "http://202.85.214.182:9001/default/《Nginx代理系统常用手册》电子书_1650129698991.pdf"}
-      ],
     }
   },
   created() {
+    this.info.id = this.$route.query.id;
+    this.queryInfoById(this.info.id);
+
     this.customerDataList();
     this.badgeCount()
   },
@@ -341,7 +307,7 @@ export default {
 
     customerDataList() {
       let model = {
-        "infoId": this.checkInfo.info.id
+        "infoId": this.info.id
       }
       httpAction(this.url.listData, model, "post")
         .then((res) => {
@@ -383,7 +349,7 @@ export default {
     badgeCount() {
       //this.fileTypeBadge = []
       let model = {
-        "infoId": this.checkInfo.info.id
+        "infoId": this.info.id
       }
       httpAction(this.url.listData, model, "post")
         .then((res) => {
@@ -429,21 +395,31 @@ export default {
           }
         })
     },
-
-    // 显示列表页面
-    showList() {
-      this.$emit('goList');
-    },
     // 显示列表页面
     showCheckList() {
-      let taskInfo = this.checkInfo.task;
-      this.$emit('goCheckList', taskInfo);
+      this.$router.go(-1);
+      this.closeCurrent();
+    },
+    handlePreview(path) {
+      let url = path;
+      if (path) {
+        url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(Base64.encode((path)))
+      }
+      return url;
     },
-    handlePreview(record) {
-      if (record && record.url) {
-        let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(Base64.encode((record.url)))
-        return url;
+    queryInfoById (id) {
+      let url = this.url.queryInfo;
+      let params = {
+        id: id
       }
+      let that = this;
+      getAction(url, params).then(res => {
+        if (res.success) {
+          that.info = res.result;
+        }
+      }).finally(() => {
+
+      })
     },
   }
 }

src/views/smscheck/modules/TaskCheckList.vue

@@ -3,14 +3,14 @@
   <div>
     <a-page-header
       style="background-color: #FFFFFF;"
-      title="稽核详情-客户列表"
+      title="客户列表"
       sub-title=""
       @back="showList"
     >
-      <a-descriptions :title="task.name" :column="3" :bordered="false">
-        <a-descriptions-item label="状态"><a-tag color="blue">{{task.stateText}}</a-tag></a-descriptions-item>
-        <a-descriptions-item label="开始时间">{{task.startTime}}</a-descriptions-item>
-        <a-descriptions-item label="结束时间">{{task.endTime}}</a-descriptions-item>
+      <a-descriptions :title="task.taskName" :column="3" :bordered="false">
+        <a-descriptions-item label="状态"><a-tag :color="task.taskStateColor">{{task.taskStateText}}</a-tag></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.description}}</a-descriptions-item>
       </a-descriptions>
       <a-divider style="margin: 6px;"/>
@@ -79,22 +79,22 @@
 
 
           <template slot="action" slot-scope="text, record">
-
-            <template v-if="record.checkState != 3 && record.checkState != 5">
-              <a @click="noticeDeal(record)">催办</a>
+            <template v-if="record.checkState === 3 || record.checkState === 4">
+              <a @click="showCheckCheck(record)">稽核</a>
               <a-divider type="vertical" />
             </template>
-            <template v-if="record.checkState >= 3">
+            <template v-if="record.checkState >= 4">
               <a @click="showCheckLog(record)">历史</a>
               <a-divider type="vertical" />
             </template>
+            <template v-if="record.checkState != 3 && record.checkState != 5">
+              <a @click="noticeDeal(record)">催办</a>
+              <a-divider type="vertical" />
+            </template>
 
             <a-dropdown>
               <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
               <a-menu slot="overlay">
-                <a-menu-item>
-                  <a @click="showCheckCheck(record)">稽核</a>
-                </a-menu-item>
 
                 <a-menu-item>
                   <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
@@ -130,17 +130,22 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 export default {
   name: 'TaskCheckList',
   mixins:[JeecgListMixin],
-  props: {
-    task: {
-      type: Object,
-      require: true
-    }
-  },
+  inject:['closeCurrent'],
   data () {
     return {
       description: '稽核详情页面',
       currentTab: 'all',
       currentCheckState: null,
+      task:{
+        id: '',
+        taskName: '',
+        taskStartTime: '',
+        taskEndTime: '',
+        description: '',
+        taskState: 0,
+        taskStateText: '',
+        taskStateColor: '',
+      },
       tabAll: '全部（0）',
       tabUndo: '未完善（0）',
       tabUncheck: '待稽核（0）',
@@ -224,6 +229,7 @@ export default {
         order: 'asc',
       },
       url: {
+        queryTask: "/smsCheck/task/queryById",
         list: "/smsCheck/customerInfo/list",
         count: "/smsCheck/customerInfo/count",
         delete: "/smsCheck/customerInfo/delete",
@@ -234,9 +240,12 @@ export default {
     }
   },
   created() {
+    this.task.id = this.$route.query.id;
+    this.queryTaskById(this.task.id);
     this.queryParam.taskId = this.task.id;
+
     this.loadData();
-    this.loadTabNumber();
+    this.loadTabNumber(this.task.id);
   },
   filters: {
     statusTypeFilter(type) {
@@ -265,22 +274,20 @@ export default {
   methods: {
     // 显示列表页面
     showList() {
-      this.$emit('goList');
+      this.$router.go(-1);
+      this.closeCurrent();
     },
     // 显示列表页面
     showCheckCheck(record) {
-      let info = this.buildTaskInfo(record);
-      this.$emit('goCheckCheck', info);
+      this.$router.push({ path: '/sms/check/task/check/check', query: { id: record.id}});
     },
     // 显示稽核详情页面
     showCheckDetail(record) {
-      let info = this.buildTaskInfo(record);
-      this.$emit('goCheckDetail', info);
+      this.$router.push({ path: '/sms/check/task/check/detail', query:{id:record.id}});
     },
     // 显示稽核历史页面
     showCheckLog(record) {
-      let info = this.buildTaskInfo(record);
-      this.$emit('goCheckLog', info);
+      this.$router.push({ path: '/sms/check/task/check/log',query:{id:record.id}});
     },
     // 构建任务信息
     buildTaskInfo(record) {
@@ -306,14 +313,14 @@ export default {
       this.loadData(1);
       this.selectedRowKeys = [];
       this.selectionRows = [];
-      this.loadTabNumber();
+      this.loadTabNumber(this.task.id);
     },
     searchReset() {
       this.queryParam = {};
       this.queryParam.taskId = this.task.id;
       this.queryParam.checkState_MultiString = this.currentCheckState;
       this.tabChange('all');
-      this.loadTabNumber();
+      this.loadTabNumber(this.queryParam.taskId);
     },
     tabChange (key) {
       // 稽核状态（0：未处理；1：未完善；2：待稽核；3：待整改；4：已整改；5：稽核通过；）
@@ -340,10 +347,10 @@ export default {
       }
       this.loadData(1);
     },
-    loadTabNumber () {
+    loadTabNumber (taskId) {
       let url = this.url.count;
       let params = {
-        id: this.task.id
+        id: taskId
       }
       let that = this;
       getAction(url, params).then(res => {
@@ -383,6 +390,33 @@ export default {
       })
 
     },
+    queryTaskById (id) {
+      let url = this.url.queryTask;
+      let params = {
+        id: id
+      }
+      let that = this;
+      getAction(url, params).then(res => {
+        if (res.success) {
+          that.task = res.result;
+          that.getTaskState(that.task.taskState);
+        }
+      }).finally(() => {
+
+      })
+    },
+    getTaskState(taskState) {
+      if (taskState === 0) {
+        this.task.taskStateColor = '#fadb14';
+        this.task.taskStateText = '未开始';
+      } else if (taskState === 1) {
+        this.task.taskStateColor = '#1890ff';
+        this.task.taskStateText = '稽核中';
+      } else if (taskState === 2) {
+        this.task.taskStateColor = '#52c41a';
+        this.task.taskStateText = '稽核完成';
+      }
+    }
   }
 }
 </script>

src/views/smscheck/modules/TaskCheckLog.vue

@@ -3,18 +3,18 @@
   <div>
     <a-page-header
       style="background-color: #FFFFFF;"
-      title="稽核详情-稽核历史"
+      title="稽核历史"
       sub-title=""
       @back="showCheckList"
     >
-      <a-descriptions :title="checkInfo.info.customerName" :column="3" :bordered="false">
-        <a-descriptions-item label="客户编号">{{checkInfo.info.customerNo}}</a-descriptions-item>
-        <a-descriptions-item label="服务号码">{{checkInfo.info.smsNumber}}</a-descriptions-item>
-        <a-descriptions-item label="用户编号">{{checkInfo.info.userNo}}</a-descriptions-item>
-        <a-descriptions-item label="入网时间">{{checkInfo.info.networkAccessTime}}</a-descriptions-item>
-        <a-descriptions-item label="用户状态" :span="2">{{checkInfo.info.userState}}</a-descriptions-item>
-        <a-descriptions-item label="员工姓名">{{checkInfo.info.staffName}}</a-descriptions-item>
-        <a-descriptions-item label="员工工号">{{checkInfo.info.staffNo}}</a-descriptions-item>
+      <a-descriptions :title="info.customerName" :column="3" :bordered="false">
+        <a-descriptions-item label="客户编号">{{info.customerNo}}</a-descriptions-item>
+        <a-descriptions-item label="服务号码">{{info.smsNumber}}</a-descriptions-item>
+        <a-descriptions-item label="用户编号">{{info.userNo}}</a-descriptions-item>
+        <a-descriptions-item label="入网时间">{{info.networkAccessTime}}</a-descriptions-item>
+        <a-descriptions-item label="用户状态" :span="2">{{info.userState}}</a-descriptions-item>
+        <a-descriptions-item label="员工姓名">{{info.staffName}}</a-descriptions-item>
+        <a-descriptions-item label="员工工号">{{info.staffNo}}</a-descriptions-item>
       </a-descriptions>
     </a-page-header>
 
@@ -88,12 +88,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 export default {
   name: 'TaskCheckLog',
   mixins:[JeecgListMixin],
-  props: {
-    checkInfo: {
-      type: Object,
-      require: true
-    }
-  },
+  inject:['closeCurrent'],
   data () {
     return {
       description: '稽核详情页面',
@@ -148,14 +143,18 @@ export default {
         },
       ],
       url: {
+        queryInfo: "/smsCheck/customerInfo/queryById",
         list: "/smsCheck/workLog/list",
       },
+      info: {},
       autoSearch: false,
     }
   },
   created() {
-    this.queryParam.taskId = this.checkInfo.task.id;
-    this.queryParam.infoId = this.checkInfo.info.id;
+    this.info.id = this.$route.query.id;
+    this.queryInfoById(this.info.id);
+
+    this.queryParam.infoId = this.info.id;
     this.loadData();
   },
   filters: {
@@ -175,14 +174,24 @@ export default {
     }
   },
   methods: {
-    // 显示列表页面
-    showList() {
-      this.$emit('goList');
-    },
     // 显示列表页面
     showCheckList() {
-      let taskInfo = this.checkInfo.task;
-      this.$emit('goCheckList', taskInfo);
+      this.$router.go(-1);
+      this.closeCurrent();
+    },
+    queryInfoById (id) {
+      let url = this.url.queryInfo;
+      let params = {
+        id: id
+      }
+      let that = this;
+      getAction(url, params).then(res => {
+        if (res.success) {
+          that.info = res.result;
+        }
+      }).finally(() => {
+
+      })
     },
   }
 }

src/views/smscheck/modules/TaskList.vue

@@ -82,26 +82,6 @@
         class="j-table-force-nowrap"
         @change="handleTableChange">
 
-        <template slot="htmlSlot" slot-scope="text">
-          <div v-html="text"></div>
-        </template>
-        <template slot="imgSlot" slot-scope="text,record">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
-          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
-        </template>
-        <template slot="fileSlot" slot-scope="text">
-          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)">
-            下载
-          </a-button>
-        </template>
-
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
@@ -142,7 +122,7 @@
     <!-- table区域 end -->
 
     <!-- 任务添加 -->
-    <task-add ref="modalForm" @ok="modalFormOk"></task-add>
+<task-add ref="modalForm" @ok="modalFormOk"></task-add>
     <task-detail ref="modalDetail" @ok="modalFormOk"></task-detail>
   </a-card>
 
@@ -160,6 +140,7 @@
   export default {
     name: 'TaskList',
     mixins:[JeecgListMixin],
+    inject:['closeCurrent'],
     components: {
       TaskAdd,
       TaskDetail,
@@ -235,9 +216,12 @@
         dictOptions: {},
         superFieldList: [],
         currentTaskState: 0,
+        autoSearch: false,
       }
     },
     created() {
+      this.queryParam.taskState = this.$route.query.state;
+      this.loadData();
       this.getSuperFieldList();
     },
     computed: {
@@ -262,8 +246,7 @@
       },
       // 显示导入页面
       showCheckList(record) {
-        let taskInfo = this.buildTaskInfo(record);
-        this.$emit('goCheckList', taskInfo);
+        this.$router.push({ path: '/sms/check/task/check' ,query:{id:record.id}});
       },
       /**
        * 构建 任务信息对象
@@ -294,21 +277,6 @@
         fieldList.push({type:'datetime',value:'taskEndTime',text:'任务结束时间'})
         this.superFieldList = fieldList
       },
-      // handleAdd: function () {
-      //   this.$refs.modalForm.add();
-      //   this.$refs.modalForm.title = "新增";
-      //   this.$refs.modalForm.disableSubmit = false;
-      // },
-      // handleEdit: function (record) {
-      //   this.$refs.modalForm.edit(record);
-      //   this.$refs.modalForm.title = "编辑";
-      //   this.$refs.modalForm.disableSubmit = false;
-      // },
-      // handleDetail:function(record){
-      //   this.$refs.modalForm.edit(record);
-      //   this.$refs.modalForm.title="详情";
-      //   this.$refs.modalForm.disableSubmit = true;
-      // },
       handleDetail(record){
         this.$refs.modalDetail.detail(record);
         this.$refs.modalDetail.title="详情";

vue.config.js

@@ -10,23 +10,8 @@ process.env.VUE_APP_VERSION = require('./package.json').version
 
 // vue.config.js
 module.exports = {
-  /*
-    Vue-cli3:
-    Crashed when using Webpack `import()` #2463
-    https://github.com/vuejs/vue-cli/issues/2463
-   */
   // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
   productionSourceMap: false,
-  //qiankuan打包时放开
-  //outputDir: "../dist/main",
-  // 多入口配置
-  // pages: {
-  //   index: {
-  //     entry: 'src/main.js',
-  //     template: 'public/index.html',
-  //     filename: 'index.html',
-  //   }
-  // },
   // 基础路径
   publicPath: process.env.VUE_APP_WEB_PUBLIC,
   configureWebpack: config => {
@@ -71,9 +56,7 @@ module.exports = {
       .use()
       .loader('babel-loader')
       .end()
-
   },
-
   css: {
     loaderOptions: {
       less: {
@@ -87,7 +70,6 @@ module.exports = {
       }
     }
   },
-
   devServer: {
     port: process.env.VUE_APP_WEB_PORT,
     proxy: {
@@ -98,6 +80,5 @@ module.exports = {
       }
     }
   },
-
   lintOnSave: undefined
 }