Merge remote-tracking branch 'origin/V0.0.2' into V0.0.2

src/api/resumption/taskManger.js

@@ -31,7 +31,11 @@ export function getRoles(args) {
  * PC端履职记录导出
  */
 export function exportResumptionRecord(args) {
-  // sdk.exportFile(`/resumption/record/export`, args);
+  return request({
+    url: "/core/resumption/record/export",
+    method: "post",
+    params: args,
+  });
 }
 
 /**

src/views/information/configuration/index.vue

@@ -132,7 +132,7 @@
     </el-form>
     <div style="margin-top: 50px; margin-left: 42%">
       <el-button type="primary" @click="saveExtend" size="small">提交</el-button>
-      <el-button type="primary" @click="nosaveExtend" size="small">取消</el-button>
+  <!--    <el-button type="primary" @click="nosaveExtend" size="small">取消</el-button> -->
     </div>
   </div>
 </template>
@@ -144,7 +144,7 @@ export default {
   components: {},
   data() {
     return {
-      
+    
       num: 1,
       day: {
         resumptionCycle: 1,
@@ -252,29 +252,37 @@ export default {
     //   });
 
     // },
-    
-    saveExtend() {
-      debugger
-      this.$refs["day"].validate(valid => {
-        if (valid) {
-          if (this.day.id != null) {
-            updateArea(this.day).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            debugger
-            insertConfiguration(this.day).then(response=>{
-                  this.$modal.msgSuccess("新增成功");
-               this.open = false;
-              
-            })
-          }
-        }
+    checkForm(form){
+      let val
+      this.$refs[form].validate(valid => {
+        console.log(valid,'valid')
+        val = valid
       });
+      return val;
     },
-
+    saveExtend() {
+    
+      let arr = ['day','week','month','season','halfYear','year'];
+      let flags = [];
+      arr.forEach(v=>{
+        flags.push(this.checkForm(v));
+      });
+      console.log(flags,'flags')
+      let flag = flags.every(v=>{
+        console.log(v,'valid')
+        return v == true;
+      })
+      console.log(flag,'flag')
+      if(!flag) return;
+      let data = {
+        coreResumptionConfiguration:[this.day,this.week,this.month,]
+      };
+      insertConfiguration(data).then(response=>{
+            this.$modal.msgSuccess("新增成功");
+          this.open = false;
+        
+      })
+    }
   },
   fillter: {},
 }

src/views/resumption/rule/dialog.edit.vue

@@ -154,6 +154,7 @@ export default {
       this.$refs.form.validate(async (isValidate) => {
         if (!isValidate) return;
         await api.update(this.formData);
+        this.$message.info("保存成功")
         this.$emit("success");
         this.isShow = false;
       });

src/views/resumption/rule/index.vue

@@ -309,6 +309,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.brand {
-}
+
 </style>

src/views/resumption/ruleManager/dialog.editItem.vue

@@ -7,7 +7,7 @@
       :show-close="true"
       @close="onHide"
     >
-      <div>
+      <div class="page-body">
         <div class="box">
           <el-form
             ref="form"
@@ -55,10 +55,10 @@
         </div>
       </div>
 
-      <span slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="onSubmit()">保 存</el-button>
-      </span>
+      </div>
     </DialogCom>
     <EditPoint
       ref="editDialog"
@@ -153,11 +153,9 @@ export default {
 };
 </script>
 
-<style lang="scss">
-.brand_info {
-  .el-form {
-    width: 600px;
-    padding-top: 40px;
-  }
+<style lang="scss" scoped>
+.box{
+  margin-bottom: 20px;
 }
+
 </style>

src/views/resumption/ruleManager/dialog.editPoint.vue

@@ -76,12 +76,12 @@
           </el-form-item>
         </el-form>
       </div>
-      <span slot="footer" class="dialog-footer">
+      <div slot="footer" class="dialog-footer">
         <el-button @click="dataVisible = false">取 消</el-button>
         <el-button type="primary" @click="onSubmit()">{{
           index >= 0 ? "保 存" : "添 加"
         }}</el-button>
-      </span>
+      </div>
     </DialogCom>
   </div>
 </template>

src/views/resumption/ruleManager/index.vue

@@ -1,4 +1,3 @@
-<!-- 动环设备管理 -->
 <template>
   <div class="app-container">
     <el-row :gutter="20">
@@ -62,6 +61,8 @@
           <el-col :span="1.5">
             <el-button
               type="primary"
+              size="mini"
+              icon="el-icon-plus"
               @click="onAddItem()"
               :disabled="rule ? false : true"
               v-hasPermi="['resumption:ruleManager:add']"
@@ -400,71 +401,71 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.show-ellipsis {
-  display: block;
-  width: 180px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-}
-.search {
-  display: flex;
-  flex-wrap: wrap;
-  & > div {
-    width: 25%;
-    display: flex;
-    align-items: center;
-    margin-bottom: 12px;
-    & > span:first-child {
-      display: inline-block;
-      min-width: 70px;
-      font-size: 14px;
-      color: #606266;
-    }
-    &:nth-child(2),
-    &:nth-child(3) {
-      margin-left: 15px;
-    }
-    &:nth-child(3) > span {
-      display: inline-block;
-      min-width: 100px;
-      font-size: 14px;
-      color: #606266;
-    }
-    &:nth-child(1) > span {
-      display: inline-block;
-      min-width: 100px;
-      font-size: 14px;
-      color: #606266;
-    }
-    &:nth-child(1) {
-    }
-  }
-}
-.box {
-  border: 1px solid #eee;
-  margin-bottom: 20px;
-  border-radius: 5px;
-  padding: 10px;
-  min-height: 120px;
-  & > p {
-    font-size: 16px;
-    font-weight: bold;
-    margin-bottom: 15px;
-  }
-}
-.item {
-  margin-bottom: 14px;
-}
-::v-deep .el-table__expanded-cell[class*="cell"] {
-  padding: 0;
-  padding-left: 47px;
-}
-::v-deep .formbox {
-  display: flex;
-  flex-wrap: wrap;
-  .el-form-item {
-    width: 50%;
-  }
-}
+// .show-ellipsis {
+//   display: block;
+//   width: 180px;
+//   overflow: hidden;
+//   white-space: nowrap;
+//   text-overflow: ellipsis;
+// }
+// .search {
+//   display: flex;
+//   flex-wrap: wrap;
+//   & > div {
+//     width: 25%;
+//     display: flex;
+//     align-items: center;
+//     margin-bottom: 12px;
+//     & > span:first-child {
+//       display: inline-block;
+//       min-width: 70px;
+//       font-size: 14px;
+//       color: #606266;
+//     }
+//     &:nth-child(2),
+//     &:nth-child(3) {
+//       margin-left: 15px;
+//     }
+//     &:nth-child(3) > span {
+//       display: inline-block;
+//       min-width: 100px;
+//       font-size: 14px;
+//       color: #606266;
+//     }
+//     &:nth-child(1) > span {
+//       display: inline-block;
+//       min-width: 100px;
+//       font-size: 14px;
+//       color: #606266;
+//     }
+//     &:nth-child(1) {
+//     }
+//   }
+// }
+// .box {
+//   border: 1px solid #eee;
+//   margin-bottom: 20px;
+//   border-radius: 5px;
+//   padding: 10px;
+//   min-height: 120px;
+//   & > p {
+//     font-size: 16px;
+//     font-weight: bold;
+//     margin-bottom: 15px;
+//   }
+// }
+// .item {
+//   margin-bottom: 14px;
+// }
+// ::v-deep .el-table__expanded-cell[class*="cell"] {
+//   padding: 0;
+//   padding-left: 47px;
+// }
+// ::v-deep .formbox {
+//   display: flex;
+//   flex-wrap: wrap;
+//   .el-form-item {
+//     width: 50%;
+//   }
+// }
 </style>

src/views/resumption/taskManager/index.vue

@@ -53,7 +53,7 @@
           <el-form-item label="履职周期" prop="executeCycle">
             <el-select
               v-model="queryParams.executeCycle"
-              placeHolder="请选择履职周期"              
+              placeHolder="请选择履职周期"
               @change="changeType($event)"
             >
               <el-option
@@ -262,17 +262,17 @@
         </el-form>
         <!--    按纽    -->
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button
               type="primary"
               plain
               icon="el-icon-download"
               size="mini"
               @click="exportExcel()"
-              v-hasPermi="['system:user:add']"
+              v-hasPermi="['resumption:taskManager:export']"
               >导出</el-button
             >
-          </el-col>
+          </el-col> -->
 
           <right-toolbar
             :showSearch.sync="showSearch"
@@ -383,12 +383,14 @@
                 type="text"
                 @click="showDetail(r.row)"
                 v-show="r.row.status == 2 || r.row.status == 3"
+                v-hasPermi="['resumption:taskManager:query']"
                 >查看</el-button
               >
               <el-button
                 type="text"
                 @click="showscanRecord(r.row)"
                 v-show="r.row.status == 2 || r.row.status == 3"
+                v-hasPermi="['resumption:taskManager:query']"
                 >扫描记录</el-button
               >
             </template>
@@ -418,7 +420,7 @@ import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 import OrgTree from "@/components/orgTree";
 import * as api from "@/api/resumption/taskManger.js";
 import { getLabel } from "@/views/commonOption.js";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 
 export default {
   name: "overviewDetialList",
@@ -645,7 +647,7 @@ export default {
 
     async exportExcel() {
       if (!this.isTableHaveData) {
-        Message.error({
+        this.$message.error({
           message: `暂无可用数据导出！`,
           type: "error",
           duration: 2000,
@@ -683,7 +685,7 @@ export default {
     },
     resetQuery() {
       this.resetForm("queryParams");
-      this.queryParams.executeCycle="2";
+      this.queryParams.executeCycle = "2";
       this.changeType("2");
       // this.queryParams.orgId = undefined;
       // this.queryParams.checkSub = false;
@@ -694,13 +696,13 @@ export default {
       this.loading = true;
       api
         .page(this.queryParams)
-        .then((r) => {          
-          r.rows.forEach(i=>{
-            if(i.status==1 && dayjs(i.planEndTime).isBefore(new Date())){
-              i.status=4;
+        .then((r) => {
+          r.rows.forEach((i) => {
+            if (i.status == 1 && dayjs(i.planEndTime).isBefore(new Date())) {
+              i.status = 4;
             }
-          })
-          
+          });
+          this.isTableHaveData = r.rows.length > 0;
           this.pageData = r.rows;
           this.total = r.total;
           this.loading = false;

src/views/system/bind/index.vue

@@ -135,7 +135,7 @@
 
 
         <el-form-item label="标签编号" prop="code">
-          <el-input v-model="form.code" placeholder="请输入标签" />
+          <el-input maxlength="50" v-model="form.code" placeholder="请输入标签" />
         </el-form-item>
 
         <el-form-item label="状态" prop="enable">