Bladeren bron

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

jiawuxian 2 jaren geleden
bovenliggende
commit
6c80ff8beb

+ 12 - 2
src/components/k-orgTree/index.vue

@@ -30,7 +30,7 @@
 
 <script>
 import tableListMixins from "@/mixins/tableList";
-import {deptTreeSelect} from "@/api/system/public";
+import {deptTreeSelect,handsheDeptTreeSelect} from "@/api/system/public";
 
 export default {
   name: "k-orgTree",
@@ -54,6 +54,12 @@ export default {
       defaultKey:null,
     }
   },
+  props:{
+    hangsheTree:{
+      type:Boolean,
+      default: false,
+    }
+  },
   watch: {
     // 根据名称筛选机构树
     deptName(val) {
@@ -70,7 +76,11 @@ export default {
     },
     /** 查询机构下拉树结构 */
     getDeptTree() {
-      deptTreeSelect().then(response => {
+      let method=deptTreeSelect;
+      if(this.hangsheTree){
+        method=handsheDeptTreeSelect
+      }
+      method().then(response => {
         this.treeList = response.data;
         this.defaultKeys.push(response.data[0].id);
         this.$emit('defaultKey',response.data[0].id);

+ 16 - 9
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,

+ 1 - 1
src/views/core/edu/plan/index.vue

@@ -30,7 +30,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="培训角色" prop="planRoleId">
-            <el-select v-model="form.planRoleId" placeholder="请选择" clearable>
+            <el-select v-model="queryParams.planRoleId" placeholder="请选择培训角色" clearable>
               <el-option v-for="item in planRoleList" :key="item.roleId" :label="item.roleName"
                          :value="item.roleId"></el-option>
             </el-select>

+ 2 - 2
src/views/core/materials/index.vue

@@ -3,8 +3,8 @@
     <el-row :gutter="20">
       <!--机构数据-->
       <el-col :span="4" :xs="24">
-        <k-org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
-                    @click="clickTreeNode"></k-org-tree>
+        <org-tree v-model="queryParams.orgId" @defaultKey="getDefaultKey" @checkChange="checkChange"
+                    @click="clickTreeNode" hangsheTree></org-tree>
       </el-col>
       <!--用户数据-->
       <el-col :span="20" :xs="24">

+ 98 - 49
src/views/system/dept/dialog.edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="rule-type">
     <el-dialog
-      :title="id ? '编辑离行式自助银行' : '新增离行式自助银行'"
+      :title="id ? '编辑' : '新增离行式自助银行'"
       :visible.sync="isShow"
       width="800px"
     >
@@ -70,10 +70,35 @@
             </el-col>
           </el-row>
           <el-row>
+          <el-col :span="12" >
+            <el-form-item label="机构类型" prop="type">
+              <el-select
+              prop="type"
+              label="机构类型"
+              v-model="form.type"
+              placeholder="请选择机构类型"
+              clearable
+            >
+              <el-option
+                v-for="dict in dict.type.sys_org_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+            </el-form-item>
+          </el-col>
+         
+        </el-row>
+          <el-row>
             <el-col :span="12">
               <el-form-item label="是否可用" prop="isLock">
-                <el-switch v-model="form.isLock" :active-value="0"
-          :inactive-value="1"> </el-switch>
+                <el-switch
+                  v-model="form.isLock"
+                  :active-value="1"
+                  :inactive-value="0"
+                >
+                </el-switch>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -81,8 +106,11 @@
                 label="加钞间出入口远程控制"
                 prop="cashAddingRoomRemoteControl"
               >
-                <el-switch v-model="form.cashAddingRoomRemoteControl" :active-value="1"
-          :inactive-value="0">
+                <el-switch
+                  v-model="form.cashAddingRoomRemoteControl"
+                  :active-value="1"
+                  :inactive-value="0"
+                >
                 </el-switch>
               </el-form-item>
             </el-col>
@@ -124,7 +152,7 @@
           @selection-change="handleOrgSelectionChange"
         >
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="序号" align="center" prop="id" />
+          <el-table-column v-if="false" label="序号" align="center" prop="id" />
           <el-table-column label="标准" align="center" prop="standard" />
           <el-table-column
             label="达标日期"
@@ -169,7 +197,7 @@
                 size="mini"
                 type="text"
                 icon="el-icon-delete"
-                @click="handleOrgDelete(scope.row)"
+                @click="handleOrgDelete(scope.$index)"
                 v-hasPermi="['system:construction:remove']"
                 >删除</el-button
               >
@@ -267,6 +295,7 @@ export default {
   dicts: ["sys_normal_disable", "sys_org_type"],
   data() {
     return {
+      tempRow:null,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -284,6 +313,7 @@ export default {
       orgform: {},
       //默认选中节点
       defaultKeys: [],
+
       rules: {
         parentId: [
           { required: true, message: "上级机构不能为空", trigger: "blur" },
@@ -322,9 +352,10 @@ export default {
   methods: {
     getOrgPhysicalDefenseConstructionInfo() {
       this.orgloading = true;
-      let dat = { orgId: this.orgid, type: 4 };
+      let dat = { orgId: this.id, type: 4 };
+      // console.log(dat,2222222222)
       listOrgPhysicalDefenseConstruction(dat).then((data) => {
-        console.log("机构信息获取成功");
+        // console.log("机构信息获取成功");
         this.constructionList = data.rows;
         this.orgloading = false;
       });
@@ -339,55 +370,69 @@ export default {
     orgcancel() {
       this.orgopen = false;
       this.orgreset();
+      this.tempRow="";
     },
     /** 提交按钮 */
     submitOrgForm() {
-      this.orgform.orgId = this.orgid;
-      this.$refs["orgform"].validate((valid) => {
-        if (valid) {
-          this.orgform.type = 4;
-          if (this.orgform.id != null) {
-            updateOrgPhysicalDefenseConstruction(this.orgform).then(
-              (response) => {
-                this.$modal.msgSuccess("修改成功");
-                this.orgopen = false;
-                this.getOrgPhysicalDefenseConstructionInfo();
-              }
-            );
-          } else {
-            addOrgPhysicalDefenseConstruction(this.orgform).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.orgopen = false;
-              this.getOrgPhysicalDefenseConstructionInfo();
-            });
-          }
-        }
-      });
+      let dat = { standard: this.orgform.standard,
+        dateOfCompliance:this.orgform.dateOfCompliance,
+        certificateEvidence:this.orgform.certificateEvidence,
+        certificate:this.orgform.certificate,
+        evidence:this.orgform.evidence
+      };
+      this.constructionList.splice(this.tempRow, 1)
+      this.constructionList.push(dat);
+      this.orgopen = false;
+      // this.orgform.orgId = this.orgid;
+      // this.$refs["orgform"].validate((valid) => {
+      //   if (valid) {
+      //     this.orgform.type = 4;
+      //     if (this.orgform.id != null) {
+      //       updateOrgPhysicalDefenseConstruction(this.orgform).then(
+      //         (response) => {
+      //           this.$modal.msgSuccess("修改成功");
+      //           this.orgopen = false;
+      //           this.getOrgPhysicalDefenseConstructionInfo();
+      //         }
+      //       );
+      //     } else {
+      //       addOrgPhysicalDefenseConstruction(this.orgform).then((response) => {
+      //         this.$modal.msgSuccess("新增成功");
+      //         this.orgopen = false;
+      //         this.getOrgPhysicalDefenseConstructionInfo();
+      //       });
+      //     }
+      //   }
+      // });
     },
     /** 删除按钮操作 */
     handleOrgDelete(row) {
-      const orgids = row.id || this.orgids;
-      this.$modal
-        .confirm('是否确认删除机构物防建设编号为"' + orgids + '"的数据项?')
-        .then(function () {
-          return delOrgPhysicalDefenseConstruction(orgids);
-        })
-        .then(() => {
-          this.getOrgPhysicalDefenseConstructionInfo();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
+      this.constructionList.splice(row, 1)
+      // this.$modal
+      //   .confirm('是否确认删除机构物防建设编号为"' + orgids + '"的数据项?')
+      //   .then(function () {
+      //     return delOrgPhysicalDefenseConstruction(orgids);
+      //   })
+      //   .then(() => {
+      //     this.getOrgPhysicalDefenseConstructionInfo();
+      //     this.$modal.msgSuccess("删除成功");
+      //   })
+      //   .catch(() => {});
     },
     /** 修改按钮操作 */
     handleOrgUpdate(row) {
       this.orgreset();
-      const id = row.id || this.orgids;
-      getOrgPhysicalDefenseConstruction(id).then((response) => {
-        // console.log(response)
-        this.orgform = response.data;
+      this.tempRow=row;
+      this.orgform = row;
         this.orgopen = true;
         this.orgtitle = "修改机构物防建设";
-      });
+      // const id = row.id || this.orgids;
+      // getOrgPhysicalDefenseConstruction(id).then((response) => {
+      //   // console.log(response)
+      //   this.orgform = response.data;
+      //   this.orgopen = true;
+      //   this.orgtitle = "修改机构物防建设";
+      // });
     },
     /** 新增按钮操作 */
     handleOrgAdd() {
@@ -438,14 +483,17 @@ export default {
       this.id = 0;
       this.constructionList = [];
       if (row != 0) {
-        // console.log(row)
+        // console.log(row,111111111111)
+        
         this.orgid = row.orgid;
         this.form = row;
+        // this.form.isLock2=row.isLock;
         this.id = row.id;
         if (row.id != null) {
           getExtendByOrgId(row.id).then((data) => {
             console.log(data.data);
             if (data.data != null) {
+              this.form.orgExtendId=data.data.id,
               this.form.cashAddingRoomRemoteControl =
                 data.data.cashAddingRoomRemoteControl;
               this.form.detachedLobbyEquipment =
@@ -472,9 +520,10 @@ export default {
           .cashAddingRoomRemoteControl
           ? 1
           : 0;
-        console.log(this.form);
+        this.form.constructionList=this.constructionList;
+        // console.log(this.form);
         addOrUpdate(this.form).then((data) => {
-          this.$modal.msgSuccess("添加成功");
+          this.$modal.msgSuccess("成功");
           this.onHide();
         });
         // this.$emit("success");

+ 14 - 13
src/views/system/dept/extend.vue

@@ -4,8 +4,9 @@
     <div class="info-box">
       <el-descriptions>
         <el-descriptions-item v-for="v in dataInfo" :label="v.label" :key="v.key">{{ v.value }}</el-descriptions-item>
-        <el-descriptions-item label="机构组织类型">{{ getLabel(dict.type.sys_org_type, type) }}</el-descriptions-item>
+        <el-descriptions-item label="机构组织类型">{{ getLabel(dict.type.reality_org_type,orgType) }}</el-descriptions-item>
         <el-descriptions-item label="是否可用">{{ isLock == 1 ? "否" : "是" }}</el-descriptions-item>
+        <el-descriptions-item label="机构类型">{{ getLabel(dict.type.sys_org_type, type) }}</el-descriptions-item>
       </el-descriptions>
     </div>
 
@@ -14,39 +15,39 @@
       <el-form inline class="demo-form-inline" label-position="left" label-width="120px">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="机构类型">
-              <el-select v-model="orgType" placeholder="机构类型">
-                <el-option v-for="dict in dict.type.org_extend_type" :key="dict.value" :label="dict.label"
+            <el-form-item label="机构类型" v-if="false">
+              <el-select v-model="type" placeholder="机构类型">
+                <el-option v-for="dict in dict.type.sys_org_type" :key="dict.value" :label="dict.label"
                   :value="dict.value"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType == 1" label="天气区域编码">
+            <el-form-item v-if="type == 4" label="天气区域编码">
               <el-input v-model="weatherAreaCode" placeholder="天气区域编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType == 1" label="营业场所面积">
+            <el-form-item v-if="type == 4" label="营业场所面积">
               <el-input v-model="premisesArea" placeholder="营业场所面积"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType == 2" label="建设时间" prop="constructionTime">
+            <el-form-item v-if="type == 10" label="建设时间" prop="constructionTime">
               <el-date-picker clearable v-model="constructionTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="请选择建设时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType == 2" label="最近一次更新" prop="lastUpdateTime">
+            <el-form-item v-if="type == 10" label="最近一次更新" prop="lastUpdateTime">
               <el-date-picker clearable v-model="lastUpdateTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="请选择更新日期">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType == 2" label="平台品牌">
+            <el-form-item v-if="type == 10" label="平台品牌">
               <el-select v-model="platformBrand" placeholder="平台品牌">
                 <el-option v-for="dict in dict.type.org_platform_brand" :key="dict.value" :label="dict.label"
                   :value="dict.value"></el-option>
@@ -54,7 +55,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item v-if="orgType == 2" label="平台供应商品牌">
+            <el-form-item v-if="type == 10" label="平台供应商品牌">
               <el-select v-model="platformSupplierBrand" placeholder="平台供应商品牌">
                 <el-option v-for="dict in dict.type.org_platform_supplier_brand" :key="dict.value" :label="dict.label"
                   :value="dict.value"></el-option>
@@ -64,7 +65,7 @@
         </el-row>
       </el-form>
     </div>
-    <div v-if="orgType == 1" class="info-box">
+    <div v-if="type == 4" class="info-box">
       <!--  下拉框选择    -->
       <div>
         <el-switch v-model="ownership" active-text inactive-text="是否自有产权" :active-value="1"
@@ -137,7 +138,7 @@
       </div>
     </div>
 
-    <div v-if="orgType == 1">
+    <div v-if="type == 4">
       <h3 class="title">业务库设置</h3>
       <div class="info-box">
         <el-form inline label-position="left" label-width="100px">
@@ -409,7 +410,7 @@ import {
 
 export default {
   dicts: [
-    "sys_org_type", "org_platform_brand", "org_platform_supplier_brand", "org_extend_type", "business_library_type"
+    "sys_org_type", "org_platform_brand", "org_platform_supplier_brand", "org_extend_type", "business_library_type","reality_org_type",
   ],
   props: [],
   components: {},

+ 26 - 1
src/views/system/dept/index.vue

@@ -79,6 +79,7 @@
                 <el-button size="mini" type="text" icon="el-icon-plus"
                   v-hasPermi="['system:dept:extend']">补充信息</el-button>
               </router-link>
+              
               <el-button size="mini" type="text" icon="el-icon-edit" @click="showDialogEdit(scope.row)"
                 v-hasPermi="['system:dept:edit']">修改</el-button>
               <el-button v-if="scope.row.parentId != 0" size="mini" type="text" icon="el-icon-delete"
@@ -126,6 +127,29 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <el-row>
+          <el-col :span="12" >
+            <el-form-item label="机构类型" prop="type">
+              <el-select
+              prop="type"
+              label="机构类型"
+              v-model="form.type"
+              placeholder="请选择机构类型"
+              clearable
+            >
+              <el-option
+                v-for="dict in dict.type.sys_org_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+            </el-form-item>
+          </el-col>
+         
+        </el-row>
+
         <el-row>
           <el-col :span="12" v-if="false">
             <el-form-item label="邮箱" prop="email">
@@ -412,7 +436,8 @@ export default {
       this.multiple = !selection.length;
     },
     showDialogEdit(row){
-
+      console.log(row,33333333333)
+// row.id=row.orgid;
       this.$refs.dialogEdit.show(row);
     },
   },

+ 3 - 1
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();