修改缺陷内容

src/views/dashboard/IndexChart2.vue

@@ -1,26 +1,26 @@
 <template>
   <div class="page-header-index-wide">
     <a-row :gutter="24">
-      <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '12px' }">
+      <a-col :sm="24" :md="24" :xl="24" :style="{ marginBottom: '12px' }">
         <a-card :loading="loading" :bordered="false">
           <template v-slot:title><a-icon type="tags" theme="twoTone"/>系统公告</template>
           <a slot="extra" @click="showMoreMsg">更多>></a>
 
-          <a-table :dataSource="announcementList" size="small" rowKey="index" :columns="columns" :pagination="false">
+          <a-table :dataSource="announcementList" size="small" rowKey="id" :columns="columns" :pagination="false">
 
           </a-table>
         </a-card>
       </a-col>
-      <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">
+<!--      <a-col :sm="24" :md="12" :xl="12" :style="{ marginBottom: '24px' }">-->
 
-        <a-card :loading="loading" :bordered="false">
-          <template v-slot:title><a-icon type="tags" theme="twoTone"/>部门公告</template>
-          <a slot="extra" @click="showMoreMsg">更多>></a>
-          <a-table :dataSource="announcementList" size="small" rowKey="index" :columns="columns" :pagination="false">
+<!--        <a-card :loading="loading" :bordered="false">-->
+<!--          <template v-slot:title><a-icon type="tags" theme="twoTone"/>部门公告</template>-->
+<!--          <a slot="extra" @click="showMoreMsg">更多>></a>-->
+<!--          <a-table :dataSource="announcementList" size="small" rowKey="id" :columns="columns" :pagination="false">-->
 
-          </a-table>
-        </a-card>
-      </a-col>
+<!--          </a-table>-->
+<!--        </a-card>-->
+<!--      </a-col>-->
 
     </a-row>
 
@@ -48,7 +48,7 @@
               <a-empty />
             </template>
             <template v-else>
-              <a-table :dataSource="subTaskWorkList" size="small" rowKey="index" :columns="subTaskWorkColumns" :pagination="false">
+              <a-table :dataSource="subTaskWorkList" size="small" rowKey="id" :columns="subTaskWorkColumns" :pagination="false">
 
                 <template v-slot:taskCheck="text, record">
                   <a @click="taskCheckLeader(record)">稽核</a>
@@ -82,7 +82,7 @@
                    rowKey="id"
                    :columns="taskColumns"
                    :customRow="customRow"
-                   :rowSelection="{type:'radio',selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                   :rowSelection="{type:'checkbox',selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
                    :pagination="false">
           </a-table>
         </a-col>
@@ -110,7 +110,7 @@
               <a-empty />
             </template>
             <template v-else>
-              <a-table :dataSource="subTaskInfoList" size="small" rowKey="index" :columns="subTaskInfoColumns" :pagination="false">
+              <a-table :dataSource="subTaskInfoList" size="small" rowKey="id" :columns="subTaskInfoColumns" :pagination="false">
                 <template v-slot:taskCheck="text, record">
                   <a @click="taskCheckManager(record)">完善</a>
                 </template>
@@ -144,7 +144,7 @@
                    rowKey="id"
                    :columns="taskColumns"
                    :customRow="customRow"
-                   :rowSelection="{type:'radio',selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+                   :rowSelection="{type:'checkbox',selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
                    :pagination="false">
           </a-table>
         </a-col>
@@ -412,7 +412,7 @@
               if(that.mainTaskList && that.mainTaskList.length > 0) {
                 that.taskId = that.mainTaskList[0].id;
                 if (that.selectedRowKeys.length === 0) {
-                  that.getWorkOrInfoList(null);
+                  that.getWorkOrInfoList();
                 } else {
                   that.getWorkOrInfoList(that.taskId);
                 }
@@ -425,9 +425,12 @@
 
         })
       },
-      getWorkList(taskId) {
-        let httpUrl = this.url.typeWork +'?taskId=' + taskId;
-        httpUrl += '&pageNo=1&pageSize=5&column=createTime&order=desc';
+      getWorkList(taskIds) {
+        let httpUrl = this.url.typeWork;
+        httpUrl += '?pageNo=1&pageSize=5&column=createTime&order=desc';
+        if (taskIds) {
+          httpUrl += '&taskIds=' + taskIds
+        }
         let params = {};
         let that = this;
         // 发送请求
@@ -444,9 +447,12 @@
 
         })
       },
-      getInfoList(taskId) {
-        let httpUrl = this.url.typeInfo +'?taskId=' + taskId;
-        httpUrl += '&pageNo=1&pageSize=5&column=createTime&order=desc';
+      getInfoList(taskIds) {
+        let httpUrl = this.url.typeInfo;
+        httpUrl += '?pageNo=1&pageSize=5&column=createTime&order=desc';
+        if (taskIds) {
+          httpUrl += '&taskIds=' + taskIds
+        }
         let params = {};
         let that = this;
         // 发送请求
@@ -483,7 +489,7 @@
       onSelectChange(selectedRowKeys, selectionRows) {
         this.selectedRowKeys = selectedRowKeys;
         this.selectionRows = selectionRows;
-        this.taskId = selectedRowKeys[0];
+        this.taskId = selectedRowKeys;
         this.getWorkOrInfoList(this.taskId);
       },
       customRow(record, index) {
@@ -492,23 +498,28 @@
           on: {
             // 鼠标单击行
             click: (event) => {
-              that.selectedRowKeys = [record.id];
-              let taskId = record.id;
-              // 和上次点击的不一样时
-              if (that.taskId !== taskId) {
-                that.taskId = record.id;
-                that.getWorkOrInfoList(taskId);
+              // 查询是否已经选中 索引大于 -1
+              let index = that.selectedRowKeys.findIndex((item,index)=>{
+                return item === record.id
+              });
+              // 存在则移除，不存在则添加
+              if (index > -1) {
+                that.selectedRowKeys.splice(index, 1);
+              } else {
+                that.selectedRowKeys.push(record.id);
               }
+              let taskIds = that.selectedRowKeys;
+              that.getWorkOrInfoList(taskIds);
             },
           }
         }
       },
       // 根据用户的角色获取对应的数据
-      getWorkOrInfoList(taskId) {
+      getWorkOrInfoList(taskIds) {
         if (this.isManager) {
-          this.getWorkList(taskId);
+          this.getWorkList(taskIds);
         } else {
-          this.getInfoList(taskId);
+          this.getInfoList(taskIds);
         }
       }
     }

src/views/dataupload/modules/TaskEdit.vue

@@ -6,6 +6,15 @@
       sub-title=""
       @back="goBack"
     >
+      <a-descriptions :title="model.customerName" :column="3" :bordered="false">
+        <a-descriptions-item label="客户编号">{{model.customerNo}}</a-descriptions-item>
+        <a-descriptions-item label="用户编号">{{model.userNo}}</a-descriptions-item>
+        <a-descriptions-item label="用户状态">{{model.userState}}</a-descriptions-item>
+        <a-descriptions-item label="服务号码">{{model.smsNumber}}</a-descriptions-item>
+        <a-descriptions-item label="入网时间" :span="2">{{model.networkAccessTime}}</a-descriptions-item>
+        <a-descriptions-item label="二级部门">{{model.staffDeptLevel2}}</a-descriptions-item>
+        <a-descriptions-item label="三级部门">{{model.staffDeptLevel3}}</a-descriptions-item>
+      </a-descriptions>
     </a-page-header>
 
     <a-card :bordered="false" style="margin-top: 10px;">
@@ -16,60 +25,61 @@
         :label-col="{ span: 2 , pull: 1}"
         :wrapper-col="{ span: 22 , pull: 1}"
       >
-        <a-card title="客户基本情况内容" :bordered="true">
-
-          <a-row>
-
-            <a-col :span="24">
-              <a-form-model-item label="客户名称" prop="customerName" v-bind="labelCol1">
-                <a-input v-model="model.customerName" placeholder="请输入客户名称"></a-input>
-              </a-form-model-item>
-            </a-col>
-            <a-col :span="8">
-              <a-form-model-item label="客户编号" prop="customerNo" v-bind="labelCol3">
-                <a-input v-model="model.customerNo" placeholder="请输入客户编号"  ></a-input>
-              </a-form-model-item>
-            </a-col>
-
-            <a-col :span="8">
-              <a-form-model-item label="用户编号" prop="userNo" v-bind="labelCol3">
-                <a-input v-model="model.userNo" placeholder="请输入用户编号"  ></a-input>
-              </a-form-model-item>
-            </a-col>
-
-
-            <a-col :span="8">
-              <a-form-model-item label="服务号码" prop="smsNumber" v-bind="labelCol3">
-                <a-input v-model="model.smsNumber" placeholder="请输入服务号码"  ></a-input>
-              </a-form-model-item>
-            </a-col>
-
-            <a-col :span="8">
-              <a-form-model-item label="入网时间" prop="networkAccessTime" v-bind="labelCol3">
-                <j-date placeholder="请选择入网时间"  v-model="model.networkAccessTime" date-format="YYYY-MM-DD" />
-              </a-form-model-item>
-            </a-col>
-
-            <a-col :span="8">
-              <a-form-model-item label="用户状态" prop="userState" v-bind="labelCol3">
-                <a-input v-model="model.userState" placeholder="请输入用户状态"></a-input>
-              </a-form-model-item>
-            </a-col>
-
-            <a-col :span="12">
-              <a-form-model-item label="二级部门" prop="staffDeptLevel2" v-bind="labelCol2">
-                <a-input v-model="model.staffDeptLevel2" placeholder="请输入用户发展二级部门"  ></a-input>
-              </a-form-model-item>
-            </a-col>
-
-            <a-col :span="12">
-              <a-form-model-item label="三级部门" prop="staffDeptLevel3" v-bind="labelCol2">
-                <a-input v-model="model.staffDeptLevel3" placeholder="请输入用户发展三级部门"  ></a-input>
-              </a-form-model-item>
-            </a-col>
-          </a-row>
-
-        </a-card>
+<!--        <a-card title="客户基本情况内容" :bordered="true">-->
+
+<!--          <a-row>-->
+
+<!--            <a-col :span="24">-->
+<!--              <a-form-model-item label="客户名称" prop="customerName" v-bind="labelCol1">-->
+<!--                <a-input v-model="model.customerName" placeholder="请输入客户名称"></a-input>-->
+<!--              </a-form-model-item>-->
+<!--            </a-col>-->
+<!--            <a-col :span="8">-->
+<!--              <a-form-model-item label="客户编号" prop="customerNo" v-bind="labelCol3">-->
+<!--                <a-input v-model="model.customerNo" placeholder="请输入客户编号"  ></a-input>-->
+<!--              </a-form-model-item>-->
+<!--            </a-col>-->
+
+<!--            <a-col :span="8">-->
+<!--              <a-form-model-item label="用户编号" prop="userNo" v-bind="labelCol3">-->
+<!--                <a-input v-model="model.userNo" placeholder="请输入用户编号"  ></a-input>-->
+<!--              </a-form-model-item>-->
+<!--            </a-col>-->
+
+
+<!--            <a-col :span="8">-->
+<!--              <a-form-model-item label="服务号码" prop="smsNumber" v-bind="labelCol3">-->
+<!--                <a-input v-model="model.smsNumber" placeholder="请输入服务号码"  ></a-input>-->
+<!--              </a-form-model-item>-->
+<!--            </a-col>-->
+
+<!--            <a-col :span="8">-->
+<!--              <a-form-model-item label="入网时间" prop="networkAccessTime" v-bind="labelCol3">-->
+<!--                <j-date placeholder="请选择入网时间"  v-model="model.networkAccessTime" date-format="YYYY-MM-DD" />-->
+<!--              </a-form-model-item>-->
+<!--            </a-col>-->
+
+<!--            <a-col :span="8">-->
+<!--              <a-form-model-item label="用户状态" prop="userState" v-bind="labelCol3">-->
+<!--                <a-input v-model="model.userState" placeholder="请输入用户状态"></a-input>-->
+<!--              </a-form-model-item>-->
+<!--            </a-col>-->
+
+<!--            <a-col :span="12">-->
+<!--              <a-form-model-item label="二级部门" prop="staffDeptLevel2" v-bind="labelCol2">-->
+<!--                <a-input v-model="model.staffDeptLevel2" placeholder="请输入用户发展二级部门"  ></a-input>-->
+<!--              </a-form-model-item>-->
+<!--            </a-col>-->
+
+<!--            <a-col :span="12">-->
+<!--              <a-form-model-item label="三级部门" prop="staffDeptLevel3" v-bind="labelCol2">-->
+<!--                <a-input v-model="model.staffDeptLevel3" placeholder="请输入用户发展三级部门"  ></a-input>-->
+<!--              </a-form-model-item>-->
+<!--            </a-col>-->
+
+<!--          </a-row>-->
+
+<!--        </a-card>-->
 
         <a-card title="业务基本情况内容" :bordered="true">
           <a-row>
@@ -372,7 +382,7 @@ export default {
   created () {
     this.model.id = this.$route.query.id;
     this.queryInfoById(this.model.id);
-    //备份model原始值
+    // 备份model原始值
     this.modelDefault = JSON.parse(JSON.stringify(this.model));
   },
   methods: {
@@ -393,7 +403,8 @@ export default {
           putAction(httpUrl,params).then((res)=>{
             if(res.success){
               that.$message.success(res.message);
-              that.closeCurrent();
+              that.jump2Upload();
+
             }else{
               that.$message.warning(res.message);
             }
@@ -417,6 +428,20 @@ export default {
 
       })
     },
+    jump2Upload() {
+      let that = this;
+      this.$confirm({
+        title: '是否跳转?',
+        content: '资料完善后，需要上传附件资料，点击确定跳转至上传资料页',
+        onOk() {
+          that.$router.push({ path: '/sms/check/data/import' ,query:{id:that.model.id}});
+          that.closeCurrent();
+        },
+        onCancel() {
+          that.closeCurrent();
+        },
+      });
+    },
   }
 }
 </script>

src/views/dataupload/modules/TaskImport.vue

@@ -1,14 +1,6 @@
 <template>
 
   <div>
-    <!--    <a-card :bordered="false">
-          <h1>
-            <span style="font-size: 14px;">资料管理 / 资料上传</span>
-          </h1>
-          <div>
-            <a-button type="primary" @click="showList">返回</a-button>
-          </div>
-        </a-card>-->
 
     <div style="background-color: #ececec; padding: 2px">
       <a-row :gutter="16">
@@ -21,7 +13,7 @@
                   style="background-color: #FFFFFF;"
                   title="资料管理 / 资料上传"
                   sub-title=""
-                  @back="showList"
+                  @back="goBack"
                 ></a-page-header>
               </div>
               <div class="table-operator">
@@ -49,7 +41,6 @@
                   <a-radio-button style="display: flex" :value=fileType.businessContract>业务合同</a-radio-button>
                 </a-badge>
 
-
                 <a-badge class="badge-width-100" :count=fileTypeBadge[fileType.smsNumberCertificate].len
                          :show-zero=fileTypeBadge[fileType.smsNumberCertificate].showZero
                          :number-style=fileTypeBadge[fileType.smsNumberCertificate].numberStyle>
@@ -74,7 +65,6 @@
                   </a-radio-button>
                 </a-badge>
 
-
                 <a-badge class="badge-width-100" :count=fileTypeBadge[fileType.businessLicence].len
                          :show-zero=fileTypeBadge[fileType.businessLicence].showZero
                          :number-style=fileTypeBadge[fileType.businessLicence].numberStyle>
@@ -128,23 +118,13 @@
               <a-list-item slot="renderItem" slot-scope="item, index">
 
                 <iframe
-                  frameborder="1"
                   :src=item.href
                   ref="ifr"
                   width="100%"
-                  height="560px"
-                  scrolling="auto">
+                  height="560px">
                 </iframe>
-                <a-list-item-meta
-                  :description=item.information
-                >
-                  <a slot="title" :href=item.href>{{ item.title }}</a>
-                  <a-avatar
-                    slot="avatar"
-                    :src=item.url
-                    icon="file"
-                  />
-                </a-list-item-meta>
+                <a-button type="danger" slot="actions" @click="removeFile(item)">移除</a-button>
+
               </a-list-item>
             </a-list>
           </a-card>
@@ -152,45 +132,6 @@
       </a-row>
     </div>
 
-    <a-card :bordered="true" style="margin-top: 12px;">
-
-
-      <!-- 操作按钮区域 start -->
-      <!--      <div class="table-operator">
-              <a-upload name="file"
-                        :showUploadList="false"
-                        :multiple="false"
-                        :headers="tokenHeader"
-                        :action="url.importExcel"
-                        @change="uploadChange">
-                <a-button type="primary" icon="upload">客户资料导入</a-button>
-              </a-upload>
-              <a-button type="primary" icon="import"
-                        @click="importInfo">确定导入</a-button>
-            </div>-->
-      <!-- 操作按钮区域 end -->
-
-      <!-- table区域 begin -->
-      <!--      <div>
-              <a-table
-                ref="table"
-                size="middle"
-                :scroll="{x:true}"
-                bordered
-
-                :columns="columns"
-                :dataSource="dataSource"
-                :pagination="false"
-                :loading="loading"
-                class="j-table-force-nowrap"
-                @change="handleTableChange">
-
-              </a-table>
-            </div>-->
-      <!-- table区域 end -->
-
-    </a-card>
-
   </div>
 
 </template>
@@ -198,8 +139,7 @@
 <script>
 
 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-import {httpAction} from '@api/manage'
-import pdf from 'vue-pdf';
+import {postAction} from '@api/manage'
 
 let Base64 = require('js-base64').Base64
 
@@ -207,18 +147,7 @@ let Base64 = require('js-base64').Base64
 export default {
   name: 'TaskImport',
   mixins: [JeecgListMixin],
-  props: {
-    infoId: {
-      //type: string,
-      require: true
-    }
-  },
-  setup() {
-
-  },
-  components: {
-    pdf
-  },
+  inject:['closeCurrent'],
   data() {
     return {
 
@@ -313,25 +242,71 @@ export default {
         importExcel: window._CONFIG['domainURL'] + "/smsCheck/task/importCustomerExcel",
         importData: "/smsCheck/task/importCustomerData",
         minioUpload: "/smsCheck/customerData/uploadMinio",
-        editUrl: "/smsCheck/customerData/edit/info/id",
+        // editUrl: "/smsCheck/customerData/edit/info/id",
+        updateFile: "/smsCheck/customerData/updateFile",
         list: "/smsCheck/customerData/list"
       },
 
       delList: [],
+      model: {},
     }
   },
-
   created() {
     //this.badgeCount()
+    this.model.id = this.$route.query.id;
+
     this.customerDataList();
     this.badgeCount()
   },
+  computed: {
+    importMinioUploadAction() {
+      return window._CONFIG['domianURL'] + this.url.minioUpload;
+    },
+  },
   methods: {
+    // 返回上一级
+    goBack() {
+      this.$router.go(-1);
+      this.closeCurrent();
+    },
+    // 返回上一级
+    removeFile(item) {
+
+      let result = [];
+      let removed = this.delList.filter(detail => {
+        if (detail.url !== item.url) {
+          result.push(detail.url)
+        }
+        return detail.url !== item.url
+      })
+      if (removed.length === this.delList.length) {
+        removed = null;
+      }
+      removed = result.join();
+
+      let value1 = this.value1;
+      let model = {
+        "infoId": this.model.id,
+        //value1:fileUrl
+      }
+      model[value1] = removed
+      postAction(this.url.updateFile, model)
+        .then((res) => {
+          if (res.success) {
+            this.customerDataList();
+            this.badgeCount();
+          } else {
+          }
+        }).finally(() => {
+
+      })
+
+    },
     customerDataList() {
       let model = {
-        "infoId": this.infoId
+        "infoId": this.model.id
       }
-      httpAction(this.url.list, model, "post")
+      postAction(this.url.list, model)
         .then((res) => {
           if (res.success) {
             let records = res.result.records;
@@ -340,18 +315,25 @@ export default {
               let record = records[0];
               let recordElement = record[this.value1];
               if (recordElement != null || recordElement != undefined) {
-                let splitList = recordElement.split(",");
+                this.delList = [];
+                let splitList = [];
+                if (recordElement) {
+                  splitList = recordElement.split(",");
+                }
                 for (var i in splitList) {
                   let splitListElement = splitList[i];
-                  let split = splitListElement.split("/");
-                  let splitElement = split[split.length - 1];
-                  let del = {
-                    title: splitElement,
-                    href: window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(Base64.encode((splitListElement))),
-                    information: "",//"上传用户：" + record.createBy
-                    url: splitListElement
+                  if (splitListElement) {
+                    let split = splitListElement.split("/");
+                    let splitElement = split[split.length - 1];
+                    let del = {
+                      title: splitElement,
+                      href: window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(Base64.encode((splitListElement))),
+                      information: "",//"上传用户：" + record.createBy
+                      url: splitListElement
+                    }
+                    this.delList.push(del)
                   }
-                  this.delList.push(del)
+
                 }
               } else {
                 this.delList = [];
@@ -371,10 +353,10 @@ export default {
     badgeCount() {
       //this.fileTypeBadge = []
       let model = {
-        "infoId": this.infoId
+        "infoId": this.model.id
       }
       let res = null;
-      httpAction(this.url.list, model, "post")
+      postAction(this.url.list, model)
         .then((res) => {
           if (res.success) {
             res = res.result.records
@@ -387,13 +369,20 @@ export default {
                 if (datum == null) {
 
                 } else {
-                  let length = datum.split(",").length;
+                  let length = 0;
+                  if (datum) {
+                    length = datum.split(",").length;
+                  }
                   let showZero = length > 0 ? false : true;
+                  let color = "#52c41a";
+                  if (showZero) {
+                    color = "#fa073f";
+                  }
                   badge = {
                     len: parseInt(length),
                     showZero: showZero,
                     numberStyle: {
-                      backgroundColor: "#52c41a"
+                      backgroundColor: color
                     }
                   }
                   this.fileTypeBadge[fileTypeElement] = badge;
@@ -448,11 +437,15 @@ export default {
           let fileUrl = info.file.response.message;
           let value1 = this.value1;
           let model = {
-            "infoId": this.infoId,
-            //value1:fileUrl
+            "infoId": this.model.id,
+          }
+          let pathStr = '';
+          for (let item in this.delList) {
+            pathStr+=this.delList[item].url + ","
           }
-          model[value1] = fileUrl
-          httpAction(this.url.editUrl, model, "post")
+          pathStr += fileUrl;
+          model[value1] = pathStr
+          postAction(this.url.updateFile, model)
             .then((res) => {
               if (res.success) {
                 this.customerDataList();
@@ -494,13 +487,6 @@ export default {
               <el-button size="mini" type="text" on-click={() => this.remove(node, data)}>Delete</el-button>
             </span>
           </span>);
-    }
-    ,
-
-
-    // 显示列表页面
-    showList() {
-      this.$emit('goList', true);
     },
     /**
      * 上传事件回调
@@ -534,13 +520,21 @@ export default {
       }
 
     },
-
-  },
-  computed: {
-    importMinioUploadAction() {
-      return window._CONFIG['domianURL'] + this.url.minioUpload;
+    removeFile2(url) {
+      let result = [];
+      let removed = this.delList.filter(detail => {
+        if (detail.url !== url) {
+          result.push(detail.url)
+        }
+        return detail.url !== url
+      })
+      if (removed.length === this.delList.length) {
+        return null;
+      }
+      return result.join();
     },
-  }
+  },
+
 }
 </script>
 

src/views/dataupload/modules/TaskList.vue

@@ -70,7 +70,7 @@
         <span slot="action" slot-scope="text, record">
           <a @click="showEdit(record)">完善</a>
           <a-divider type="vertical"/>
-          <a @click="handUpload(record)">上传</a>
+          <a @click="showUpload(record)">上传</a>
           <a-divider type="vertical"/>
 
           <template v-if="record.checkState == 1 || record.checkState == 4">
@@ -84,8 +84,8 @@
                 <a @click="handleDetail(record)">详情</a>
               </a-menu-item>
               <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
+                <a-popconfirm title="确定清空吗?" @confirm="() => dataDelete(record.id)">
+                  <a>清空</a>
                 </a-popconfirm>
               </a-menu-item>
             </a-menu>
@@ -110,7 +110,7 @@ import {mixinDevice} from '@/utils/mixin'
 import {JeecgListMixin} from '@/mixins/JeecgListMixin'
 import SmsCheckTaskModal from './SmsCheckTaskModal'
 import TaskAdd from './TaskAdd'
-import {httpAction} from "@api/manage";
+import {postAction, deleteAction} from "@api/manage";
 
 export default {
   name: 'TaskList',
@@ -186,6 +186,7 @@ export default {
         delete: "/smsCheck/customerInfo/delete",
         deleteBatch: "/smsCheck/customerInfo/deleteBatch",
         exportXlsUrl: "/smsCheck/customerInfo/exportXls",
+        dataDelete: "/smsCheck/customerData/clear",
       },
       dictOptions: {},
       superFieldList: [],
@@ -223,22 +224,18 @@ export default {
     showAdd() {
       this.$emit('goAdd', true);
     },
-    // 显示导入页面
-    showImport() {
-      this.$emit('goImport', true);
-    },
-    // 显示添加页面
-    showEdit(record) {
-      this.$router.push({ path: '/sms/check/data/edit' ,query:{id:record.id}});
-    },
-    handUpload(record) {
+    // 显示附件上传页面
+    showUpload(record) {
       let infoId = record.id;
       if (infoId == undefined || infoId == null) {
         this.$message.warning('用户编号不能为空！');
         return;
       }
-      //console.log(record)
-      this.$emit('goImport', infoId);
+      this.$router.push({ path: '/sms/check/data/import' ,query:{id:record.id}});
+    },
+    // 显示添加页面
+    showEdit(record) {
+      this.$router.push({ path: '/sms/check/data/edit' ,query:{id:record.id}});
     },
     handSubmit(record) {
       let nowIpagination = this.ipagination;
@@ -246,7 +243,7 @@ export default {
         "id": record.id,
         //value1:fileUrl
       }
-      httpAction(this.url.editCheck, model, "post")
+      postAction(this.url.editCheck, model)
         .then((res) => {
           if (res.success) {
             this.$message.success(res.message)
@@ -270,18 +267,17 @@ export default {
       fieldList.push({type: 'datetime', value: 'taskStartTime', text: '任务开始时间'})
       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;
-    // },
+    },
+    dataDelete(id) {
+      var that = this;
+      deleteAction(that.url.dataDelete, {infoId: id}).then((res) => {
+        if (res.success) {
+          that.$message.success('附件资料清空完成！');
+        } else {
+          that.$message.warning('附件资料清空失败！');
+        }
+      });
+    },
   }
 }
 </script>

src/views/smscheck/modules/TaskAdd.vue

@@ -32,7 +32,8 @@
             </a-col>
             <a-col :span="24">
               <a-form-model-item label="描述" prop="description" v-bind="labelCol1">
-                <a-textarea v-model="model.description" rows="4" placeholder="请输入描述" />
+<!--                <a-textarea v-model="model.description" rows="4" placeholder="请输入描述" />-->
+                <j-editor v-model="model.description"/>
               </a-form-model-item>
             </a-col>
 

src/views/smscheck/modules/TaskCheckCheck.vue

@@ -491,7 +491,7 @@ export default {
             that.confirmLoading = false;
           })
 
-          that.showCheckList();
+          that.goBack();
         } else {
           that.$message.warning('请检查必填项！');
         }

src/views/smscheck/modules/TaskCheckDetail.vue

@@ -12,7 +12,7 @@
         <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="用户状态" :span="2">{{info.userStateStr}}</a-descriptions-item>
         <a-descriptions-item label="员工姓名">{{info.staffName}}</a-descriptions-item>
         <a-descriptions-item label="员工工号">{{info.staffNo}}</a-descriptions-item>
       </a-descriptions>
@@ -416,6 +416,11 @@ export default {
       getAction(url, params).then(res => {
         if (res.success) {
           that.info = res.result;
+          that.info = res.result;
+          that.info.userStateStr = that.info.userState;
+          if (that.info.userState === '1') {
+            that.info.userStateStr = '在用';
+          }
         }
       }).finally(() => {
 

src/views/smscheck/modules/TaskCheckList.vue

@@ -5,13 +5,13 @@
       style="background-color: #FFFFFF;"
       title="客户列表"
       sub-title=""
-      @back="showList"
+      @back="goBack"
     >
       <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-item label="描述"><span v-html="task.description"></span></a-descriptions-item>-->
       </a-descriptions>
       <a-divider style="margin: 6px;"/>
     </a-page-header>
@@ -79,7 +79,7 @@
 
 
           <template slot="action" slot-scope="text, record">
-            <template v-if="record.checkState === 3 || record.checkState === 4">
+            <template v-if="record.checkState === 2 || record.checkState === 3">
               <a @click="showCheckCheck(record)">稽核</a>
               <a-divider type="vertical" />
             </template>
@@ -87,7 +87,7 @@
               <a @click="showCheckLog(record)">历史</a>
               <a-divider type="vertical" />
             </template>
-            <template v-if="record.checkState != 3 && record.checkState != 5">
+            <template v-if="record.checkState != 2 && record.checkState != 3 && record.checkState != 5">
               <a @click="noticeDeal(record)">催办</a>
               <a-divider type="vertical" />
             </template>
@@ -111,6 +111,10 @@
           <template v-slot:checkState="status">
             <a-badge :status="status | statusTypeFilter" :text="status | statusFilter"/>
           </template>
+          <template v-slot:rowIndex="text,records,index">
+                    {{ (ipagination.current - 1) * ipagination.pageSize + Number(index)+1 }}
+          </template>
+
         </a-table>
 
       </div>
@@ -132,6 +136,7 @@ export default {
   mixins:[JeecgListMixin],
   inject:['closeCurrent'],
   data () {
+    let _self = this;
     return {
       description: '稽核详情页面',
       currentTab: 'all',
@@ -163,21 +168,24 @@ export default {
           key:'rowIndex',
           width:60,
           align:"center",
-          customRender:function (t,r,index) {
-            return parseInt(index)+1;
-          }
-        },
-        {
-          title:'客户编号',
-          align:"center",
-          dataIndex: 'customerNo'
+          scopedSlots: { customRender: 'rowIndex' }
+          // customRender: ({ text, record, index }) => {
+          //   return `${ (ipagination.current - 1) * ipagination.pageSize + index + 1}`;
+          // }
         },
         {
           title:'客户名称',
-          align:"center",
+          align:"left",
+          sorter: true,
           dataIndex: 'customerName',
           scopedSlots: { customRender: 'customerName' }
         },
+        {
+          title:'客户编号',
+          align:"center",
+          sorter: true,
+          dataIndex: 'customerNo'
+        },
         {
           title:'服务号码（全）',
           align:"center",
@@ -191,6 +199,7 @@ export default {
         {
           title:'入网时间',
           align:"center",
+          sorter: true,
           dataIndex: 'networkAccessTime'
         },
         {
@@ -214,6 +223,7 @@ export default {
         {
           title:'员工工号',
           align:"center",
+          sorter: true,
           dataIndex: 'staffNo'
         },
         {
@@ -280,8 +290,8 @@ export default {
     }
   },
   methods: {
-    // 显示列表页面
-    showList() {
+    // 返回上一级
+    goBack() {
       this.$router.go(-1);
       this.closeCurrent();
     },

src/views/smscheck/modules/TaskDetail.vue

@@ -11,11 +11,11 @@
 
     <a-spin :spinning="confirmLoading">
       <a-descriptions :title="model.taskName" :column="3" :bordered="true" size="small">
-        <a-descriptions-item label="任务状态"><a-tag color="blue">{{model.taskState_dictText}}</a-tag></a-descriptions-item>
+        <a-descriptions-item label="任务状态"><a-tag :color="model.taskStateColor">{{model.taskStateText}}</a-tag></a-descriptions-item>
         <a-descriptions-item label="开始时间">{{model.taskStartTime}}</a-descriptions-item>
         <a-descriptions-item label="结束时间">{{model.taskEndTime}}</a-descriptions-item>
-        <a-descriptions-item label="描述" :span="3">{{model.description}}</a-descriptions-item>
-        <a-descriptions-item label="客户总数">{{model.customerCount}}</a-descriptions-item>
+        <a-descriptions-item label="客户总数" :span="3">{{model.customerCount}}</a-descriptions-item>
+        <a-descriptions-item label="描述"><span v-html="model.description"></span></a-descriptions-item>
 <!--        <a-descriptions-item label="待稽核数">{{model.checkCount}}</a-descriptions-item>-->
       </a-descriptions>
     </a-spin>
@@ -46,8 +46,21 @@ export default {
     },
     detail (record) {
       this.model = Object.assign({}, record);
+      this.getTaskState(this.model.taskState);
       this.visible = true;
     },
+    getTaskState(taskState) {
+      if (taskState === 0) {
+        this.model.taskStateColor = '#fadb14';
+        this.model.taskStateText = '未开始';
+      } else if (taskState === 1) {
+        this.model.taskStateColor = '#1890ff';
+        this.model.taskStateText = '稽核中';
+      } else if (taskState === 2) {
+        this.model.taskStateColor = '#52c41a';
+        this.model.taskStateText = '稽核完成';
+      }
+    },
   }
 }
 </script>

src/views/smscheck/modules/TaskList.vue

@@ -131,7 +131,7 @@
 
 <script>
 
-  import { httpAction } from '@api/manage'
+  import { putAction } from '@api/manage'
   import '@/assets/less/TableExpand.less'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import TaskAdd from './TaskAdd'
@@ -163,29 +163,33 @@
           {
             title:'任务名称',
             align:"center",
+            sorter: true,
             dataIndex: 'taskName',
             scopedSlots: { customRender: 'taskName' }
           },
           {
             title:'任务状态',
             align:"center",
+            sorter: true,
             dataIndex: 'taskState_dictText'
           },
           {
             title:'任务开始时间',
             align:"center",
+            sorter: true,
             dataIndex: 'taskStartTime'
           },
           {
             title:'任务结束时间',
             align:"center",
+            sorter: true,
             dataIndex: 'taskEndTime'
           },
-          {
-            title:'描述',
-            align:"center",
-            dataIndex: 'description'
-          },
+          // {
+          //   title:'描述',
+          //   align:"center",
+          //   dataIndex: 'description'
+          // },
           {
             title:'客户总数',
             align:"center",
@@ -286,10 +290,9 @@
         let that = this;
         let httpUrl = this.url.edit;
         let param = record;
-        let method = 'put';
 
         // 发送请求
-        httpAction(httpUrl, param, method)
+        putAction(httpUrl, param)
           .then((res) => {
             if(res.success){
               that.$message.success("稽核任务已开始！");
@@ -305,10 +308,9 @@
         let that = this;
         let httpUrl = this.url.edit;
         let param = record;
-        let method = 'put';
 
         // 发送请求
-        httpAction(httpUrl, param, method)
+        putAction(httpUrl, param)
           .then((res) => {
             if(res.success){
               that.$message.success("稽核任务已结束！");