Merge branch 'dev' of http://10.87.10.227:4000/jzyd_yyds/soc_web into dev

src/views/core/accessPlan/index.vue

@@ -32,9 +32,9 @@
                 :value="`${dict.value}`"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="状态" prop="planStatus">
+          <el-form-item label="计划状态" prop="planStatus">
             <el-select style="width: 100%;" v-model="queryParams.planStatus" placeholder="请选择">
-              <el-option v-for="dict in dict.type.sys_normal_disable" :key="dict.value" :label="dict.label"
+              <el-option v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.label"
                 :value="`${dict.value}`"></el-option>
             </el-select>
           </el-form-item>
@@ -63,7 +63,7 @@
           <el-table-column label="计划所属机构" align="center" prop="orgName" />
           <el-table-column label="计划名称" align="center" prop="planName" />
 
-          <el-table-column label="机构类型" align="center" key="orgType" prop="orgType" width="80">
+          <el-table-column label="调阅机构类型" align="center" key="orgType" prop="orgType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.orgType" />
             </template>
@@ -79,7 +79,7 @@
 
           <el-table-column label="计划状态" align="center" key="planStatus" prop="planStatus" width="80">
             <template slot-scope="scope">
-              <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.planStatus" />
+              <dict-tag :options="dict.type.plan_status" :value="scope.row.planStatus" />
             </template>
           </el-table-column>
           <el-table-column label="修改人" align="center" prop="updateBy" />
@@ -91,8 +91,8 @@
                 v-hasPermi="['system:plan:edit']">修改</el-button>
               <el-button size="mini" type="text" v-if="scope.row.planStatus != 0" icon="el-icon-add"
                 @click="handDistribute(scope.row)" v-hasPermi="['system:plan:add']">下发</el-button>
-              <el-button size="mini" type="text" v-if="scope.row.planStatus != 0" icon="el-icon-add"
-                @click="handDistribute(scope.row)" v-hasPermi="['system:plan:add']">删除</el-button>
+              <!-- <el-button size="mini" type="text" v-if="scope.row.planStatus != 0" icon="el-icon-add"
+                @click="handDistribute(scope.row)" v-hasPermi="['system:plan:add']">删除</el-button> -->
 
               <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
                 v-hasPermi="['system:device:remove']">删除</el-button>
@@ -126,7 +126,14 @@
           </el-select>
         </el-form-item>
 
-
+      
+            <el-form-item label="计划状态" prop="planStatus">
+              <el-radio-group v-model="form.planStatus">
+                <el-radio v-for="dict in dict.type.plan_status" :key="dict.value" :label="dict.value">{{ dict.label
+                }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+         
 
 
         <el-form-item style="width: 100%;" v-if="form.planCycle == 0" label="开始时间" prop="startTime">
@@ -176,7 +183,7 @@ import KFileUpload from "@/components/K-FileUpload/index.vue";
 
 export default {
   name: "Plan",
-  dicts: ['sys_org_type', 'sys_access_cycle', 'sys_normal_disable'],
+  dicts: ['sys_org_type', 'sys_access_cycle', 'sys_normal_disable','plan_status'],
   components:{
     orgTree
   },
@@ -260,7 +267,7 @@ export default {
         roleId: null,
         planCycle: null,
         planFrequency: null,
-        planStatus: null,
+        planStatus: "0",
         createTime: null,
         createBy: null,
         updateTime: null,

src/views/resumption/rule/index.vue

@@ -30,12 +30,12 @@
               clearable
             />
           </el-form-item>
-          <el-form-item prop="type" label="履职库类型">
+          <el-form-item prop="type" label="履职类型">
             <el-select
               prop="ruleTypeId"
-              label="履职库类型"
+              label="履职类型"
               v-model="queryParams.type"
-              placeholder="请选择履职库类型"
+              placeholder="请选择履职类型"
               clearable
             >
               <el-option
@@ -141,7 +141,7 @@
           ></el-table-column>
           <el-table-column
             prop="typeName"
-            label="履职库类型"
+            label="履职类型"
             v-if="columns[2].visible"
           >
             <template slot-scope="r"

src/views/resumption/ruleManager/index.vue

@@ -77,6 +77,7 @@
               @click="onAddItem()"
               :disabled="rule ? false : true"
               v-hasPermi="['resumption:ruleManager:add']"
+              v-if="rule && rule.orgId == orgId"
               >新 增</el-button
             >
             <!-- <el-button
@@ -211,7 +212,7 @@
 </template>
 
 <script>
-import { mapState, mapMutations } from "vuex";
+import { mapGetters, mapMutations } from "vuex";
 import { page, treeData, del } from "@/api/resumption/ruleManager.js";
 import DialogEdit from "./dialog.editItem.vue";
 
@@ -231,7 +232,7 @@ export default {
       filterText: null,
       showSearch: true,
       rule: null, //选中的内容库
-
+      // orgOfRule:null,//选中内容库
       expandAll: false,
       fresh: true,
       // checked: false,
@@ -255,12 +256,14 @@ export default {
         { key: 3, label: `履职内容`, visible: true },
         { key: 4, label: `履职区域`, visible: true },
       ],
+      currentOrgId:null,
     };
   },
 
   components: { DialogEdit },
 
   computed: {
+    ...mapGetters(["orgId"])
     // ...mapState(["org", "loginUser"]),
   },
 
@@ -268,6 +271,7 @@ export default {
     filterText(val) {
       this.$refs.tree.filter(val);
     },
+    
   },
 
   async created() {
@@ -277,7 +281,9 @@ export default {
     // await this.getassetlist();
   },
 
-  mounted() {},
+  mounted() {
+
+  },
 
   methods: {
     ...mapMutations([]),
@@ -304,7 +310,7 @@ export default {
       }
       const data = await page(this.queryParams);
       this.tableData = data.rows;
-      this.total = data.total;
+      this.total =Number.parseInt(data.total);
       this.expandAll = false;
     },
     async gettreelist() {
@@ -321,7 +327,7 @@ export default {
       this.currentPage = val;
       this.getList();
     },
-    clicktreenode(data) {
+    clicktreenode(data,node) {
       if (!data.isRule) {
         return;
       }
@@ -334,6 +340,7 @@ export default {
 
       this.queryParams.ruleId = data.id;
       this.rule = data;
+      this.rule.orgId=node.parent.data.id
       this.refresh();
     },
     async deldata(val) {

src/views/system/device/index.vue

@@ -343,6 +343,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.names= selection.map(item => item.deviceName)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -389,7 +390,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除编号为"' + ids + '"的数据项？').then(function () {
+      const names=row.deviceName || this.names;
+      this.$modal.confirm('是否确认删除名称为"' + names + '"的数据项？').then(function () {
         return delDevice(ids);
       }).then(() => {
         this.getList();