qymljy vor 2 Jahren
Ursprung
Commit
5a2e18f267

+ 1 - 1
src/HManagement/ecycle/customer/index.vue

@@ -16,7 +16,7 @@
         <div class="mt-10">
           <p class="search__label">应用:</p>
           <el-select
-              class="inline-24"
+              class="inline-16"
               size="small"
               v-model="application"
               placeholder="请选择范围"

+ 58 - 1
src/HManagement/ecycle/modules/recovery.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="text" size="mini" @click="onshow" :disabled="!tool.checkAuth($route.name,'recovery')">恢 复</el-button>
+    <el-button type="text" size="mini" @click="queryRule" :disabled="!tool.checkAuth($route.name,'recovery')">恢 复</el-button>
   </div>
 </template>
 
@@ -8,7 +8,64 @@
 export default {
   name: "recovery",
   props:["sys_object","ownerid"],
+  data(){
+    return {
+      dialogTableVisible:false,
+      list:[],
+      tablecols:[],
+      total:0,
+      currentPage:0,
+      param:{
+        "id": 20221208172002,
+        "pageNumber": 1,
+        "pageSize": 999,
+        "content": {
+          "sa_customersid":"",
+          "enterprisename":"",
+          "taxno":"",
+          "address":""
+        },
+      },
+      fields1:[],
+      fields2:[],
+      fields3:[],
+    }
+  },
   methods:{
+    /*查询规则*/
+    async queryRule(){
+      const res = await this.$api.requested({
+        "id": "20230410090502",
+        "content": {},
+      })
+      this.fields1 = res.data.custcheckrule.fields1
+      this.fields2 = res.data.custcheckrule.fields2
+      this.fields3 = res.data.custcheckrule.fields3
+      this.queryData()
+    },
+    async queryData(){
+      this.fields1.forEach(item=>{
+        this.param.content[item] = this.data[item] || ""
+      })
+      this.fields2.forEach(item=>{
+        this.param.content[item] = this.data[item] || ""
+      })
+      this.fields3.forEach(item=>{
+        this.param.content[item] = this.data[item] || ""
+      })
+      this.param.content.sa_customersid = this.data.sa_customersid
+      const res = await this.$api.requested(this.param)
+      this.list = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      console.log(res.data,'是否重复')
+      if (res.data.length > 0){
+        this.dialogTableVisible = true
+      }else {
+        this.onshow()
+      }
+
+    },
     onshow() {
       this.$confirm('数据恢复至原账号原位置,是否继续?', '提示', {
         confirmButtonText: '确定',

+ 4 - 4
src/HManagement/task/modules/detail.vue

@@ -39,8 +39,8 @@
                 </span>
                 <span v-else>--</span>
               </el-descriptions-item>
-              <el-descriptions-item label-class-name="my-label" label="开始时间">{{mainData.starttime?mainData.starttime:'--'}}</el-descriptions-item>
-              <el-descriptions-item label-class-name="my-label" label="结束时间">{{mainData.endtime?mainData.endtime:'无限'}}</el-descriptions-item>
+              <el-descriptions-item label-class-name="my-label" label="开始日期">{{mainData.starttime?mainData.starttime:'--'}}</el-descriptions-item>
+              <el-descriptions-item label-class-name="my-label" label="结束日期">{{mainData.endtime?mainData.endtime:'无限'}}</el-descriptions-item>
               <el-descriptions-item label-class-name="my-label" label="提醒时间">{{mainData.remindday? mainData.remindday + '天' :'无需提醒'}}</el-descriptions-item>
               <el-descriptions-item label-class-name="my-label" label="关联应用数据">
                 <el-button type="text" v-if="mainData.systemapp.length !== 0" @click="onGoto">{{mainData.systemapp[0].systemappname}}</el-button>
@@ -124,11 +124,11 @@ export default {
           value:this.mainData.createdate
         },
         {
-          label:'开始时间',
+          label:'开始日期',
           value:this.mainData.starttime
         },
         {
-          label:'结束时间',
+          label:'结束日期',
           value:this.mainData.endtime?this.mainData.endtime:'无限'
         },
         {