Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/api/system/check.js

@@ -24,6 +24,13 @@ export function getCheckByAreaId(areaId) {
   })
 }
 
+// 查询区域采集点通过机构id
+export function getAreaCheckInfoByOrgId(orgId) {
+  return request({
+    url: '/system/check/getAreaCheckInfoByOrg/' + orgId.id,
+    method: 'get'
+  })
+}
 // 查询部门下拉树结构
 export function deptTreeSelect() {
   return request({

src/views/core/accessPlan/index.vue

@@ -5,7 +5,7 @@
       <el-col :span="4" :xs="24">
 
         <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-                  @click="clickTreeNode" hangsheTree></org-tree>
+                  @click="clickTreeNode" businessTree></org-tree>
       </el-col>
       <!--搜索栏-->
 
@@ -56,7 +56,7 @@
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                       v-hasPermi="['core:accessPlan:add']">新增
+                 v-hasPermi="['core:accessPlan:add']"  v-if="check==true" >新增
             </el-button>
           </el-col>
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -212,6 +212,7 @@
         total: 0,
         // 监控调阅计划表格数据
         planList: [],
+        check:null,
         //角色列表
         roleList: [],
         // 弹出层标题
@@ -278,7 +279,8 @@
       getList() {
         this.loading = true;
         listPlan(this.queryParams).then(response => {
-          this.planList = response.rows;
+          this.planList = response.data.rows;
+          this.check=response.check;
           this.total = response.total;
           this.loading = false;
         });

src/views/information/configuration/index.vue

@@ -57,8 +57,6 @@
             <el-form-item label="提前" prop="allDay">
               <el-input-number size="mini" style="width: 30%;" v-model="week.allDay" @change="handleChange" :min="1"
                 :max="100" label="描述文字"></el-input-number>
-              <!-- <el-date-picker v-model="timeValue" format="yyyy-MM-dd HH" value-format="yyyy-MM-dd HH" type="datetime">
-    </el-date-picker> -->
               天提醒
             </el-form-item>
 

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

@@ -30,6 +30,7 @@
             <el-col :span="6">
               <el-form-item prop="planType" label="计划类型:">
                 <el-select
+                @change="changeData"
                   label="计划类型"
                   v-model="formData.planType"
                   placeholder="请选择计划类型"
@@ -67,6 +68,7 @@
             <el-col :span="6">
               <el-form-item prop="planStatus" label="计划状态:">
                 <el-select
+                  :disabled="getDistributePlanStatus()"
                   prop="planStatus"
                   label="计划状态"
                   v-model="formData.planStatus"
@@ -107,6 +109,7 @@
             <el-col :span="6">
               <el-form-item prop="roleList" label="履职角色:">
                 <el-select
+                :disabled="isSubmitting"
                   label="履职角色"
                   v-model="formData.roleList"
                   placeholder="请选择履职角色"
@@ -144,7 +147,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item prop="count" label="履职次数:">
-                <el-input-number
+                <el-input-number :disabled="getPlanExec()"
                   style="margin-left: 10px"
                   v-model="formData.count"
                   controls-position="right"
@@ -190,7 +193,7 @@
           <el-table-column prop="areaName" label="履职区域"> </el-table-column>
           <el-table-column prop="areaName" label="操作">
             <template v-slot="{ row }">
-              <el-button type="text" @click="removeRow(row)">删除</el-button>
+              <el-button v-if="getshenglianshe()" type="text" @click="removeRow(row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -230,6 +233,7 @@ export default {
     // let o=statusOptions;
     // debugger
     return {
+      isSubmitting:false,
       defaultSelect: [],
       selectedValues: [],
       resumptionRoles: [],
@@ -309,6 +313,36 @@ export default {
     ...mapGetters(["orgId", "orgName"]),
   },
   methods: {
+    //省联社履职内容不能删除
+    getshenglianshe(){
+      if(this.formData.planCreateOrgType!=null&&this.formData.planCreateOrgType==1&&this.formData.distributePlanStatus!=null){
+        return false;
+      }else
+      return true;
+
+    },
+    //选择计划类型修改联动框
+    changeData(){
+      this.formData.planCycle=null;
+      this.formData.execOrgType=null;
+      this.formData.roleList=null;
+      this.formData.planExec=null;
+      this.formData.count=null;
+      this.tableData=null;
+    },
+    //当时间为全天或者营业中才显示
+    getPlanExec(){
+      if(this.formData.planExec==null||this.formData.planExec==2||this.formData.planExec==4){
+        return true;
+      }else
+      return false;
+    },
+    getDistributePlanStatus() {
+      // console.log(this.formData.distributePlanStatus, "distributePlanStatus");
+      if (this.formData.distributePlanStatus==1) {
+        return true;
+      } else return false;
+    },
     reset() {
       return {
         planName: null,
@@ -327,6 +361,8 @@ export default {
         planCreateOrgId: null,
         planCreateOrgName: null,
         roleList: null,
+        distributePlanStatus: null,
+        planCreateOrgType:null,
       };
     },
     getRolesByOrg() {
@@ -373,6 +409,7 @@ export default {
       }
     },
     onOrgTypeChanged() {
+      this.formData.roleList=null;
       this.getRolesByOrg();
     },
     async show(id, other = {}) {
@@ -383,9 +420,8 @@ export default {
       console.log(id);
       if (id !== undefined) {
         await api.get(id).then((res) => {
-          console.log(res);
+          console.log(res, "res");
           this.tableData = res.data.itemList;
-
         });
       }
 
@@ -410,7 +446,7 @@ export default {
       if (!this.tableData) {
         return [];
       } else {
-        console.log()
+        console.log();
         return this.tableData.map((d) => d.id);
       }
     },
@@ -419,6 +455,7 @@ export default {
     },
     onSubmit() {
       this.$refs.form.validate(async (isValidate) => {
+        this.isSubmitting=true;
         // this.formData.note = this.formData.description;
         this.formData.planCreateOrgId = this.orgId;
         this.formData.planCreateOrgName = this.orgName;
@@ -427,6 +464,7 @@ export default {
         this.formData.roleList =
           this.selectedValues.length == 0 ? null : this.selectedValues;
         await api.update(this.formData);
+        this.isSubmitting=false;
         this.$emit("success");
         this.onHide();
       });

src/views/resumption/plan/index.vue

@@ -415,7 +415,7 @@ export default {
       if (
         row != null &&
         row != undefined &&
-        row.planCreateOrgId == this.orgId
+        row.planOfOrgId == this.orgId
       ) {
         return true;
       }
@@ -423,7 +423,7 @@ export default {
     },
     //已完成下发的计划不显示下发按钮
     checkCanPublish(row) {
-      if (row.createOrgType == "1" && row.children.length == 0) {
+      if (row.createOrgType == "1" && row.children.length == 0&&row.planStatus==1) {
         return true;
       }
       return false;

src/views/system/bind/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <!--部门数据-->
-      <el-col :span="4" :xs="24">
+      <!-- <el-col :span="4" :xs="24">
         <div class="head-container">
           <el-input v-model="deptName" placeholder="请输入机构名称" clearable size="small" prefix-icon="el-icon-search"
             style="margin-bottom: 20px" />
@@ -15,6 +15,13 @@
             :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="defaultKeys"
             :default-checked-keys="defaultKeys" @node-click="handleNodeClick" />
         </div>
+      </el-col> -->
+
+      <!--机构数据-->
+      <el-col :span="4" :xs="24">
+
+        <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
+          @click="clickTreeNode" businessTree></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
@@ -23,7 +30,8 @@
           </el-form-item>
 
           <el-form-item label="标签编号" prop="code">
-            <el-input maxlength="50" v-model="queryParams.code" placeholder="请输入标签编号" clearable @keyup.enter.native="handleQuery" />
+            <el-input maxlength="50" v-model="queryParams.code" placeholder="请输入标签编号" clearable
+              @keyup.enter.native="handleQuery" />
           </el-form-item>
 
 
@@ -47,24 +55,13 @@
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
               v-hasPermi="['system:bind:add']">新增</el-button>
           </el-col>
-<!--          <el-col :span="1.5">-->
-<!--            <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"-->
-<!--              v-hasPermi="['system:bind:edit']">修改</el-button>-->
-<!--          </el-col>-->
-<!--          <el-col :span="1.5">-->
-<!--            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"-->
-<!--              v-hasPermi="['system:bind:remove']">删除</el-button>-->
-<!--          </el-col>-->
 
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table
-          border
-          height="600"
-          size="small"
-          v-loading="loading" :data="bindList" @selection-change="handleSelectionChange">
-          <!--<el-table-column type="selection" width="55" align="center" />-->
+        <el-table border height="600" size="small" v-loading="loading" :data="bindList"
+          @selection-change="handleSelectionChange">
+
           <el-table-column label="序号" align="center" min-width="50">
             <template v-slot:default="scope">
               <span v-text="getPageIndex(scope.$index)"> </span>
@@ -76,7 +73,7 @@
 
           <el-table-column label="NFC点位" align="left" prop="collectionAreaName" />
           <el-table-column label="标签编号" align="left" prop="code" />
-
+          <el-table-column label="标签名称" align="left" prop="labelName" />
           <el-table-column prop="status" label="状态" width="80">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.plan_status" :value="scope.row.enable" />
@@ -102,25 +99,26 @@
     <!-- 添加或修改【请填写功能名称】对话框 -->
     <DialogCom :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-            <el-form-item label="机构名称" prop="orgId">
-              <treeselect v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
-                :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择机构" @select="changeSelectArea" />
-            </el-form-item>
-            <el-form-item label="区域名称" v-if="form.orgId!=null" prop="areaId">
-              <el-select  mode="multiple" style="width: 100%;" v-model="form.areaId" placeholder="请选择区域名称" @change="changeSelect">
-                <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
-              </el-select>
-            </el-form-item>
-
-            <el-form-item label="NFC点位" v-if="form.orgId!=null" prop="checkId">
-              <el-select style="width: 100%;" v-model="form.checkId" placeholder="请选择NFC点位名称">
-                <el-option v-for="item in checkList" :key="item.id" :label="item.checkName" :value="item.id"></el-option>
-              </el-select>
-            </el-form-item>
-
+        <el-form-item label="机构名称" prop="orgId">
+          <treeselect v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
+            :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择机构" @select="changeSelectArea" />
+        </el-form-item>
+        <el-form-item label="区域名称" v-if="form.orgId != null" prop="areaId">
+          <el-select mode="multiple" style="width: 100%;" v-model="form.areaId" placeholder="请选择区域名称">
+            <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="NFC点位" v-if="form.orgId != null" prop="checkId">
+          <el-select style="width: 100%;" v-model="form.checkId" placeholder="请选择NFC点位名称">
+            <el-option v-for="item in checkList" :key="item.id" :label="item.checkName" :value="item.id"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="标签编号" prop="code">
           <el-input maxlength="50" v-model="form.code" placeholder="请输入标签" />
         </el-form-item>
+        <el-form-item label="标签名称" prop="labelName">
+          <el-input v-model="form.labelName" placeholder="请输入标签名称" maxlength="50" />
+        </el-form-item>
 
         <el-form-item label="状态" prop="enable">
           <el-select style="width: 100%" v-model="form.enable" placeholder="请选择状态">
@@ -145,13 +143,14 @@ import tableList from '@/mixins/tableList'
 import treeselect from '@riophae/vue-treeselect'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { listBind, getBind, delBind, addBind, updateBind } from "@/api/system/bind";
-import{getAreaByOrg} from "@/api/system/area";
+import { getAreaByOrg } from "@/api/system/area";
 import { deptTreeSelect } from "@/api/system/public";
-import { getCheckByAreaId } from "@/api/system/check";
+import { getCheckByAreaId, getAreaCheckInfoByOrgId } from "@/api/system/check";
+import orgTree from "@/components/orgTree";
 export default {
   /** 引入基础minxins*/
   mixins: [tableList],
-  components: { treeselect },
+  components: { treeselect, orgTree },
   dicts: ['sys_normal_disable', 'plan_status'],
   data() {
     return {
@@ -159,8 +158,8 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
-       // 总条数
-       total: 0,
+      // 总条数
+      total: 0,
       names: [],
       //搜索tree
       deptName: null,
@@ -192,7 +191,7 @@ export default {
         orgPath: null,
         collectionAreaName: null,
         checkId: null,
-        checkSub:true
+        checkSub: true
       },
       // 表单参数
       form: {},
@@ -212,6 +211,9 @@ export default {
         ],
         enable: [
           { required: true, message: '请选择状态', trigger: 'blur' }
+        ],
+        labelName:[
+          { required: true, message: '请输入标签名称', trigger: 'change'}
         ]
       },
       checkList: [],
@@ -235,13 +237,23 @@ export default {
     }
   },
   methods: {
+    //单选框状态改变
+    checkChange(state) {
+      this.queryParams.checkSub = state;
+      this.handleQuery();
+    },
+    // 节点单击事件
+    clickTreeNode(data) {
+      this.queryParams.orgId = data.id;
+      this.handleQuery();
+    },
     getPageIndex($index) {
       //表格序号
       return (
         (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
       );
     },
-    closeOptions(){
+    closeOptions() {
       this.$refs.fuzzySearch[0].blur()
     },
 
@@ -259,19 +271,29 @@ export default {
       this.queryParams.orgId = data.id;
       this.handleQuery();
     },
-    changeSelectArea(val){
-      getAreaByOrg(val).then(response =>{
-      this.roleOptions  = response.data;
-    this.  form.areaId=null
+    changeSelectArea(val) {
+      getAreaByOrg(val).then(response => {
+        this.roleOptions = response.data;
+        this.form.areaId = null
       })
-    },
-
-    changeSelect(val) {
-      getCheckByAreaId(val).then(response => {
+      getAreaCheckInfoByOrgId(val).then(response => {
         this.form.checkId = null;
         this.checkList = response.data;
       })
     },
+    getDefaultKey(key) {
+      this.queryParams.orgId = key;
+      this.getList();
+    },
+    // changeSelect(val) {
+    //   getCheckByAreaId(val).then(response => {
+
+    //     this.checkList = response.data;
+    //   })
+    //   getAreaCheckInfoByOrgId(val).then(response=>{
+    //     this.checkList = response.data;
+    //   })
+    // },
     /** 查询【请填写功能名称】列表 */
     getList() {
       this.loading = true;
@@ -287,7 +309,6 @@ export default {
         this.deptOptions = response.data;
         this.defaultKeys.push(response.data[0].id);
         this.queryParams.orgId = response.data[0].id;
-        console.log( this.queryParams.orgId+"%%%%%%%%%%%%%%%")
         this.handleQuery();
       });
     },

src/views/system/check/index.vue

@@ -71,7 +71,7 @@
             </template>
           </el-table-column>
           <el-table-column label="所属机构" align="left" prop="orgName"/>
-          <el-table-column label="区域名称" align="left" prop="areaName"/>
+          <!-- <el-table-column label="区域名称" align="left" prop="areaName"/> -->
           <el-table-column label="NFC点位" align="left" prop="checkName"/>
           <el-table-column label="修改人" align="center" prop="updateBy"/>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -104,11 +104,11 @@
                         :normalizer="tenantIdnormalizer"
                         :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择机构" @select="changeSelectArea"/>
           </el-form-item>
-          <el-form-item label="区域名称" v-if="form.orgId!=null" prop="areaId">
+          <!-- <el-form-item label="区域名称" v-if="form.orgId!=null" prop="areaId">
             <el-select style="width: 100%;" v-model="form.areaId" placeholder="请选择区域名称">
               <el-option v-for="item in roleOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
             </el-select>
-          </el-form-item>
+          </el-form-item> -->
         </el-row>
         <el-form-item label="NFC点位" prop="checkName">
           <el-input v-model="form.checkName" placeholder="请输入NFC点位名称"/>