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

src/api/core/accessPlan.js

@@ -21,6 +21,7 @@ export function getPlan(id) {
 export function distribute(id) {
   return request({
     url: '/core/accessPlan/distribute/' + id,
+    showLoading:true,
     method: 'get'
   })
 }

src/api/resumption/plan.js

@@ -24,6 +24,13 @@ export function cheHui(id) {
   })
 }
 // 查询【请填写功能名称】详细
+export function distributeCheHui(id) {
+  return request({
+    url: '/core/api/plan/distributeCheHui/' + id,
+    method: 'get'
+  })
+}
+// 查询【请填写功能名称】详细
 export function distribute(query) {
   return request({
     url: '/core/api/plan/distribute' ,

src/api/safetycheck/plan.js

@@ -8,7 +8,20 @@ export function list(query) {
     data: query
   })
 }
-
+// 查询【请填写功能名称】详细
+export function cheHui(id) {
+  return request({
+    url: '/core/checkplan/cheHui/' + id,
+    method: 'get'
+  })
+}
+// 查询【请填写功能名称】详细
+export function distributeCheHui(id) {
+  return request({
+    url: '/core/checkplan/distributeCheHui/' + id,
+    method: 'get'
+  })
+}
 // 查询【请填写功能名称】详细
 export function itemfind(id) {
   return request({

src/views/check/dialog.edit.vue

@@ -64,7 +64,21 @@
                 </el-select>
               </el-form-item>
             </el-col>
-
+            <el-col :span="6">
+              <el-form-item
+                prop="buildTaskNow"
+                label="立即生效:"
+                v-if="NowBuild()"
+              >
+                <el-checkbox
+                  :disabled="id ? true : false"
+                  v-model="formData.buildTaskNow"
+                  size="medium"
+                  @change="handleCheckboxChange"
+                  >默认从下个周期生成任务，<br>勾选后从当前周期立即生成任务</el-checkbox
+                >
+              </el-form-item>
+            </el-col>
             <el-col :span="6">
               <el-form-item
                 prop="startDate"
@@ -174,21 +188,7 @@
                 ></el-input-number>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item
-                prop="buildTaskNow"
-                label="立即生效:"
-                v-if="NowBuild()"
-              >
-                <el-checkbox
-                  :disabled="id ? true : false"
-                  v-model="formData.buildTaskNow"
-                  size="medium"
-                  @change="handleCheckboxChange"
-                  >勾选后当前周期开始生效</el-checkbox
-                >
-              </el-form-item>
-            </el-col>
+           
           </el-row>
           <el-row>
             <el-col :span="6">
@@ -215,9 +215,9 @@
                 </org-tree-select>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
-              <el-form-item prop="planStatus" label="计划状态">
-                <!-- <el-select
+            <!-- <el-col :span="6"> -->
+            <!-- <el-form-item prop="planStatus" label="计划状态"> -->
+            <!-- <el-select
                   label="计划状态"
                   v-model="formData.planStatus"
                   placeholder="请选择计划状态"
@@ -231,13 +231,13 @@
                   >
                   </el-option>
                 </el-select> -->
-                <el-switch
+            <!-- <el-switch
                   v-model="formData.planStatus"
                   active-value="1"
                   inactive-value="2"
-                ></el-switch>
-              </el-form-item>
-            </el-col>
+                ></el-switch> -->
+            <!-- </el-form-item> -->
+            <!-- </el-col> -->
           </el-row>
           <el-form-item :span="6" prop="description" label="备注">
             <el-input
@@ -348,7 +348,6 @@ export default {
         planName: [{ required: true, message: "请输入计划名称" }],
         checkType: [{ required: true, message: "请选择检查类型" }],
         planCycle: [{ required: true, message: "请选择检查周期" }],
-        planStatus: [{ required: true, message: "请选择计划状态" }],
         execOrgType: [{ required: true, message: "请选择检查机构类型" }],
         roleList: [{ required: true, message: "请选择检查角色" }],
         planExec: [{ required: true, message: "请选择计划时间" }],
@@ -552,13 +551,13 @@ export default {
       this.$refs.form.validate(async (isValidate) => {
         this.formData.planCreateOrgId = this.orgId;
         this.formData.planCreateOrgName = this.orgName;
+        this.formData.planStatus = 0;
         if (!isValidate) return;
         this.formData.rulePointList =
           this.tableData == null ? [] : this.tableData;
         this.formData.roleList = null;
         this.formData.roleIds =
           this.selectedValues.length == 0 ? null : this.selectedValues;
-
         await api.add(this.formData);
         this.$emit("success");
         this.onHide();

src/views/check/index.vue

@@ -115,7 +115,6 @@
               >
               </el-option>
             </el-select>
-            <!-- <el-switch v-model="queryParams.planStatus" active-value="1" inactive-value="2"></el-switch> -->
           </el-form-item>
           <el-form-item>
             <el-button
@@ -306,6 +305,14 @@
                 @click="showDialogDistribute(r.row)"
                 v-hasPermi="['core:checkplan:distribute']"
                 >下发</el-button>
+                <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-arrow-down"
+                v-if="chehui(r.row)"
+                @click="chhuile(r.row)"
+                v-hasPermi="['core:checkplan:distribute']"
+                >撤回</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -410,8 +417,8 @@ export default {
       // console.log(row.planOfOrgType == "1","row.planOfOrgType")
       // console.log(row.planOfOrgType == "1"&& row.distribute==null,"row.distribute")
 
-      //如果计划所属机构为省联社并且计划下发为null并且计划检查机构类型不为省联社和办事处(只有一个无法下发)
-      if (row.planOfOrgType == "1"&& row.distribute==null&&row.execOrgType!="1"&&row.execOrgType!="2") {
+      //如果计划所属机构为省联社并且计划下发状态为0并且计划检查机构类型不为省联社和办事处(只有一个无法下发)
+      if (row.planOfOrgType == "1"&& row.distribute==0&&row.execOrgType!="1"&&row.execOrgType!="2") {
         return true
       }
 
@@ -467,8 +474,41 @@ export default {
     onEdit(id, other = {}) {
       this.$refs.editDialog.show(id, other);
     },
+     //开始撤回
+     chhuile(row) {
+      this.loading = true;
+      api.cheHui(row.id).then((response) => {
+        this.getList();
+        this.loading = false;
+      });
+    },
+    //已下发的显示撤回
+    chehui(row) {
+      if (row.distribute == 1) {
+        return true;
+      }
+      return false;
+    },
     showDialogDistribute(row){
-      this.$refs.dialogDistribute.show(row);
+      this.loading = true;
+      api
+        .distributeCheHui(row.id)
+        .then((response) => {
+          // console.log(response, "then");
+          if (response.data == 0) {
+            this.loading = false;
+            this.$refs.dialogDistribute.show(row);
+          } else {
+            this.getList();
+            this.loading = false;
+          }
+        })
+        .catch((response) => {
+          // console.log(response, "catch");
+          this.getList();
+          this.loading = false;
+          this.$refs.dialogDistribute.show(row);
+        });
     },
     async onDel(id, name) {
       this.$modal

src/views/core/accessPlan/index.vue

@@ -99,7 +99,7 @@
               <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleUpdate(scope.row)" v-if="(scope.row.parentOrgId==isEdit||scope.row.orgId==isEdit)&&check==true"
                          v-hasPermi="['core:accessPlan:edit','core:accessPlan:query']">编辑
               </el-button>
-              <el-button size="mini" type="text" v-if="(scope.row.orgId==isEdit)&&scope.row.isDistribute == 0 && scope.row.planStatus==0" icon="el-icon-arrow-down"
+              <el-button size="mini" type="text" v-if="scope.row.orgId==isEdit&&(1==xf)&&scope.row.isDistribute == 0 && scope.row.planStatus==0" icon="el-icon-arrow-down"
                          @click="handDistribute(scope.row)" v-hasPermi="['core:accessPlan:add']">下发
               </el-button>
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-if="(scope.row.parentOrgId==isEdit)&&scope.row.parentId==null && check==true"
@@ -165,13 +165,25 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="立即生成任务" prop="immediately" v-if="form.planCycle!=0">
+      <!-- <el-form-item label="立即生成任务" prop="immediately" v-if="form.planCycle!=0">
           <el-radio-group v-model="form.immediately">
             <el-radio v-for="dict in dict.type.is_full" :key="dict.value" :label="dict.value" :disabled="form.isEdit">{{ dict.label
               }}
             </el-radio>
           </el-radio-group>
-        </el-form-item>
+        </el-form-item>  -->
+
+            <el-form-item label="立即生效" prop="immediately" v-if="form.planCycle!=0">
+              <el-checkbox v-model="form.immediately">
+              
+                <el-popover placement="top-start" title="" width="200" trigger="hover"
+                            content="">
+                  <i class="el-icon-warning-outline change-icon" slot="reference"></i>
+                </el-popover>
+              </el-checkbox>
+            </el-form-item> 
+
+       
         <el-form-item label="备注" prop="description">
           <el-input v-model="form.description" type="textarea" placeholder="请输入备注" :disabled="form.isEdit"/>
         </el-form-item>
@@ -305,6 +317,7 @@
           this.planList = response.data.rows;
           this.check=response.check;
           this.isEdit=response.isEdit;
+          this.xf=response.xf;
           this.total = response.data.total;
           this.loading = false;
         });
@@ -327,7 +340,7 @@
           planCycle: null,
           planFrequency: null,
           planStatus: "0",
-          immediately:"2",
+          immediately:false,
           createTime: null,
           createBy: null,
           updateTime: null,

src/views/core/send/index.vue

@@ -232,6 +232,9 @@ export default {
         content: [
           { required: true, message: '请输入内容', trigger: 'change' },
         ],
+        sendTime: [
+          { required: true, message: '请选择发送时间', trigger: 'change' },
+        ],
       }
     };
   },
@@ -276,7 +279,7 @@ export default {
         content: null,
         sendUser: null,
         sendRole: null,
-        sendTimeType: null,
+        sendTimeType: "1",
         sendTime: null,
         delFlag: null,
         createTime: null,

src/views/core/task/index.vue

@@ -129,9 +129,9 @@
             type="text"
             icon="el-icon-view"
             @click="lookView(scope.row)"
-            v-if="scope.row.status == 2"
             v-hasPermi="['core:task:query']"
           >详情</el-button>
+<!--          v-if="scope.row.status == 2"-->
         </template>
       </el-table-column>
     </el-table>
@@ -317,6 +317,7 @@ export default {
 
     /** 导出按钮操作 */
    handleExport() {
+     console.log(this);
       this.download('core/retrievalTask/export', {
         ...this.queryParams
       }, `${this.orgName+'-监控调阅任务记录-'+this.formatTime(new Date(),'YYYYMMhh')}.xlsx`)

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

@@ -640,6 +640,7 @@ export default {
       this.getRolesByOrg();
     },
     async show(id, other = {}) {
+      this.buildTime=null;
       this.id = id;
       this.tableData = null;
       this.formData.itemList = null;

src/views/resumption/plan/index.vue

@@ -428,11 +428,12 @@ export default {
     //已完成下发的计划不显示下发按钮
     checkCanPublish(row) {
       // console.log(row.planOfOrgType,"row.planOfOrgType")
-      if (row.planOfOrgType == "1" && (row.distribute == null||row.distribute == 2)) {
+      if (row.planOfOrgType == "1" && row.distribute == 0) {
         return true;
       }
       return false;
     },
+    //开始撤回
     chhuile(row) {
       this.loading = true;
       api.cheHui(row.id).then((response) => {
@@ -440,8 +441,9 @@ export default {
         this.loading = false;
       });
     },
+    //已下发的显示撤回
     chehui(row) {
-      if (row.planOfOrgType == "1" && row.distribute == 1) {
+      if (row.distribute == 1) {
         return true;
       }
       return false;
@@ -492,17 +494,25 @@ export default {
       this.$refs.editDialog.show(id, other);
     },
     showDialogDistribute(row) {
-      api.cheHui(row.id).then((response) => {
-        console.log(response.data,"appPlanService.cheHui(id);")
-        if(response.data!=1){
-          this.$refs.dialogDistribute.show(row);
-        }else{
-          this.getList();
-        }
-          
-          
+      this.loading = true;
+      api
+        .distributeCheHui(row.id)
+        .then((response) => {
+          // console.log(response, "then");
+          if (response.data == 0) {
+            this.loading = false;
+            this.$refs.dialogDistribute.show(row);
+          } else {
+            this.getList();
+            this.loading = false;
+          }
         })
-      
+        .catch((response) => {
+          // console.log(response, "catch");
+          this.getList();
+          this.loading = false;
+          this.$refs.dialogDistribute.show(row);
+        });
     },
     async onDel(id, name) {
       this.$modal

src/views/system/dept/dialog.edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="rule-type">
     <DialogCom
-      :title="id ? '编辑' : '新增离行式自助银行'"
+      :title="id ? '编辑' : '新增'"
       :visible.sync="isShow"
       width="800px"
     >

src/views/system/dept/extend.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <h3 class="title"><i class="el-icon-collection-tag"></i>同步信息</h3>
+    <h3 class="title"><i class="el-icon-collection-tag"></i> 同步信息</h3>
     <div class="info-box">
       <el-descriptions>
         <el-descriptions-item
@@ -52,7 +52,7 @@
         <el-table-column type="index" label="序号" align="center" prop="id" />
         <el-table-column label="机构类型" align="center" prop="type">
           <template slot-scope="r"
-            >{{ getLabel(dict.type.sys_org_type, `${r.row.type}`) }}
+            >{{ getLabels(`${r.row.type}`) }}
           </template>
         </el-table-column>
         <el-table-column label="标准" align="center" prop="standard">
@@ -339,7 +339,7 @@
         <el-col :span="6">
           <el-form-item
             label="大堂设备"
-            v-if="(type == 4) & (selfServiceBank > 0)"
+            v-if="(type == 4)"
           >
             <el-input-number
               v-model="lobbyEquipment"
@@ -353,7 +353,7 @@
         <el-col :span="6">
           <el-form-item
             label="穿墙设备"
-            v-if="(type == 4) & (selfServiceBank > 0)"
+            v-if="(type == 4)"
           >
             <el-input-number
               v-model="wallPenetratingEquipment"
@@ -410,7 +410,7 @@
       width="500px"
       append-to-body
     >
-      <el-form ref="orgform" :model="orgform" label-width="80px" :rules="rules">
+      <el-form ref="orgform" :model="orgform" label-width="100px" :rules="rules">
         <el-form-item label="机构类型" prop="type">
           <!-- <el-input v-model="orgform.standard" placeholder="请输入标准" /> -->
           <el-select
@@ -421,8 +421,7 @@
             clearable
           >
             <el-option
-              v-for="dict in dict.type.sys_org_type"
-              v-if="dict.value == 4 || dict.value == 5 || dict.value == 10"
+              v-for="dict in orgTypes"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -430,8 +429,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="标准" prop="standard">
-          <!-- <el-input v-model="orgform.standard" placeholder="请输入标准" /> -->
+        <el-form-item label="GA38标准" prop="standard">
           <el-select
             prop="planType"
             label="标准"
@@ -472,7 +470,7 @@
             placeholder="请输入证书"
           /> -->
           <div class="image-container" style="margin-left: 20px">
-            <p style="font-size: 12px; color: #999">上传证书</p>
+            <p style="font-size: 12px; color: #999">上传安全防范设施合格证书</p>
             <image-upload
               :limit="5"
               :fileSize="2"
@@ -587,6 +585,7 @@ export default {
       //基础信息key
       infoKeys: [
         { label: "机构名称", key: "name" },
+        { label: "机构简称", key: "shortName" },
         // { label: "机构组织类型", key: "type" },
         // { label: "部门机构电话", key: "phone" },
         { label: "机构地址", key: "address" },
@@ -594,7 +593,7 @@ export default {
         // { label: "是否可用", key: "isLock" },
         { label: "更新时间", key: "updateTime" },
         { label: "同步时间", key: "createTime" },
-        { label: "机构简称", key: "shortName" },
+       
       ],
 
       type: null,
@@ -676,10 +675,11 @@ export default {
       uploadp: uploadpng,
       uplp: uplpng,
       //下拉框生成信息
-      orgTypes: {
-        orgTyp1: { label: "营业网点", value: 0 },
-        orgTyp2: { label: "监控中心", value: 1 },
-      },
+      orgTypes: [
+         { label: "营业网点", value: 0 },
+         { label: "网点业务库", value: 1 },
+         { label: "在行式自助银行", value: 2 },
+         ],
       businessLibraryTypes: {
         businessLibraryTyp1: { label: "1类业务库", value: 1 },
         businessLibraryTyp2: { label: "2类业务库", value: 2 },
@@ -758,6 +758,13 @@ export default {
     },
   },
   computed: {
+    getLabels() {
+    return function(value) {
+      const option = this.orgTypes.filter(item => item.value == value);
+      // console.log(option[0].label,"option")
+      return option ? option[0].label : '';
+    }
+  },
     switchModel: {
       get() {
         return this.switchValue === 1; // 将0转换为false，1转换为true

src/views/system/dept/index.vue

@@ -313,6 +313,7 @@
             <el-form-item label="机构简称" prop="shortName">
               <el-input
                 v-model="form.shortName"
+                :maxlength="50" @input="shorteditRestriction"
                 placeholder="请输入机构简称"
                 :disabled="form.source == 1"
               />
@@ -374,6 +375,7 @@
                 controls-position="right"
                 style="width: 100%"
                 :min="0"
+                :max="999999"
               />
             </el-form-item>
           </el-col>
@@ -542,6 +544,10 @@ export default {
       // 限制只允许输入汉字、英文和数字
       this.form.name = this.form.name.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '');
     },
+    shorteditRestriction(){
+      // 限制只允许输入汉字、英文和数字
+      this.form.shortName = this.form.shortName.replace(/[^\u4e00-\u9fa5a-zA-Z0-9]/g, '');
+    },
     getCode(item) {
       if (item != null && item.length > 0) {
         let area = this.areaList.find((v) => v.key === item);

src/views/system/user/index.vue

@@ -122,7 +122,7 @@
           </el-col> -->
           <el-col :span="1.5">
             <el-button
-              type="info"
+              type="primary"
               plain
               icon="el-icon-upload2"
               size="mini"
@@ -134,7 +134,7 @@
 
           <el-col :span="1.5">
             <el-button
-              type="warning"
+              type="primary"
               plain
               icon="el-icon-download"
               size="mini"
@@ -145,7 +145,7 @@
           </el-col>
           <el-col :span="1.5">
             <el-button
-              type="warning"
+              type="primary"
               plain
               icon="el-icon-download"
               size="mini"