Merge branch 'V0.0.5' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.5

src/components/common/textarea.vue

@@ -51,5 +51,8 @@ export default {
     right: 12px;
     font-size: 12px;
   }
+  .el-textarea {
+    font-size: 15px !important;
+  }
 }
 </style>

src/router/index.js

@@ -138,7 +138,7 @@ export const dynamicRoutes = [
     path: "/system/user-extend",
     component: Layout,
     hidden: true,
-    permissions: ["system:user:extend"],
+    permissions: ["system:information:edit"],
     children: [
       {
         path: "extend/:userId(\\d+)",

src/views/core/accessPlan/index.vue

@@ -220,7 +220,7 @@
               label="操作"
               fixed="right"
               width="220px"
-              align="left"
+              align="center"
               class-name="small-padding fixed-width"
             >
               <template slot-scope="scope">

src/views/core/drill/drillDictionary/index.vue

@@ -170,7 +170,7 @@
             <el-table-column
               label="操作"
               align="center"
-              width="150"
+              width="200"
               class-name="small-padding fixed-width"
             >
               <template slot-scope="scope">
@@ -220,6 +220,7 @@
       :visible.sync="open"
       width="1000px"
       append-to-body
+      :close="cancel"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-form-item label="演练项目" prop="drillType" style="width: 100%">

src/views/core/drill/task/dialog.newtask.vue

@@ -95,7 +95,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item prop="imageList" ref="fileImage" label="演练图片">
-                <imgUpload ref="uploadimage" type="more" :value="formData.imageList" @input="imageListChanged">
+                <imgUpload ref="uploadimage" :limit="10" type="more" :value="formData.imageList" @input="imageListChanged">
                 </imgUpload>
               </el-form-item>
             </el-col>
@@ -434,7 +434,12 @@ export default {
 };
 </script>
 
-<!-- <style lang="less">
-.edu-training-edit {
+<!-- <style lang="scss" scoped>
+.k-textarea{
+  .el-textarea {
+    .el-textarea__inner  {
+      font-size: 15px !important;
+    }
+  } 
 }
 </style> -->

src/views/core/drill/task/dialog.perform.vue

@@ -99,7 +99,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item prop="imageList" ref="fileImage" label="演练图片">
-                <imgUpload ref="uploadimage" type="more" :value="formData.imageList" @input="imageListChanged">
+                <imgUpload ref="uploadimage" :limit="10" type="more" :value="formData.imageList" @input="imageListChanged">
                 </imgUpload>
               </el-form-item>
             </el-col>

src/views/core/drill/task/dialog.select.drillDictionary.vue

@@ -4,7 +4,7 @@
     :visible.sync="isShow"
     class="g-dialog-select-safe-check"
     :close-on-click-modal="false"
-    width="55%"
+    width="75%"
     top="10vh"
     append-to-body
   >
@@ -58,9 +58,9 @@
 
         <!-- 表格 -->
         <template slot="columns">
-          <el-table-column label="编号" align="center" prop="id"/>
-          <el-table-column prop="orgName" label="机构名称" width="200"></el-table-column>
-          <el-table-column label="演练项目" align="center" prop="drillType">
+          <!-- <el-table-column label="编号" align="center" prop="id"/> -->
+          <el-table-column prop="orgName" align="center" label="机构名称" width="180"></el-table-column>
+          <el-table-column label="演练项目" align="center" width="180" prop="drillType">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.core_drill_type" :value="scope.row.drillType"/>
             </template>
@@ -70,11 +70,11 @@
                    <dict-tag :options="dict.type.core_drill_category" :value="scope.row.drillCategory"/>
                  </template>
                </el-table-column>-->
-          <el-table-column label="演练场景" scoped-slot="drillProjects" align="center" width="180"
+          <el-table-column label="演练场景"  align="center" width="180" :show-overflow-tooltip="true"
                            prop="drillProjects">
-            <template slot-scope="scope">
+            <!-- <template slot-scope="scope">
               <div class="ellipsis" :title="scope.row.drillProjects">{{ scope.row.drillProjects }}</div>
-            </template>
+            </template> -->
           </el-table-column>
           <el-table-column
             label="预设案由"

src/views/core/drill/task/index.vue

@@ -105,6 +105,7 @@
                   icon="el-icon-plus"
                   size="mini"
                   @click="handleAddTask"
+                  v-hasPermi="['core:drillTask:edit']"
                   >临时登记
                 </el-button>
               </el-col>

src/views/core/edu/task/dialog.newTask.vue

@@ -96,7 +96,7 @@
 
             <el-col :span="24">
               <el-form-item prop="imageList" ref="fileImage" label="培训图片">
-                <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
+                <imgUpload ref="uploadimage" :limit="10" type="more" :value="formData.imageList"
                            @input="imageListChanged"></imgUpload>
               </el-form-item>
             </el-col>

src/views/core/edu/task/dialog.perform.vue

@@ -91,7 +91,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item prop="imageList" ref="fileImage" label="培训图片">
-                <imgUpload ref="uploadimage" type="more" :value="formData.imageList"
+                <imgUpload ref="uploadimage" :limit="10" type="more" :value="formData.imageList"
                            @input="imageListChanged"></imgUpload>
               </el-form-item>
             </el-col>

src/views/core/edu/task/index.vue

@@ -105,6 +105,7 @@
                   type="primary"
                   icon="el-icon-plus"
                   size="mini"
+                  v-hasPermi="['core:eduTask:edit']"
                   @click="handleAddTask"
                   >临时登记</el-button
                 >
@@ -243,7 +244,7 @@
                   icon="el-icon-document-add"
                   v-if="canPerform(scope.row)"
                   @click="handleRecorded(scope.row.id)"
-                  v-hasPermi="['core:eduTask:remove']"
+                  v-hasPermi="['core:eduTask:edit']"
                   >任务登记
                 </el-button>
                 <el-button

src/views/core/message/index.vue

@@ -129,7 +129,7 @@
               width="250"
               prop="orgName"
             />
-            <el-table-column
+<!--            <el-table-column
               label="消息类型"
               align="center"
               width="200"
@@ -141,7 +141,7 @@
                   :value="scope.row.messagType"
                 />
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column
               label="机构类型"
               width="200"
@@ -151,15 +151,15 @@
               <template slot-scope="scope">
                 <dict-tag
                   :options="dict.type.sys_org_type"
-                  :value="scope.row.tagOrgType"
+                  :value="scope.row.tagOrgTypes"
                 />
               </template>
             </el-table-column>
-            <el-table-column prop="tagRoleIds" width="180" label="目标角色">
+<!--            <el-table-column prop="tagRoleIds" width="180" label="目标角色">
               <template slot-scope="r">
                 <span>{{ getRolename(r.row.tagRoleIds) }}</span>
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column
               label="标题"
               align="center"
@@ -289,7 +289,7 @@
             :maxlength="100"
           />
         </el-form-item>
-        <el-form-item label="消息类型" prop="messagType">
+<!--        <el-form-item label="消息类型" prop="messagType">
           <el-select
             v-model="form.messagType"
             placeholder="请选择消息类型"
@@ -304,14 +304,14 @@
               :value="dict.value"
             ></el-option>
           </el-select>
-        </el-form-item>
-        <el-form-item label="机构类型" prop="tagOrgType">
+        </el-form-item>-->
+        <el-form-item label="下发机构类型" prop="tagOrgType">
           <el-select
-            v-model="form.tagOrgType"
-            placeholder="请选择机构类型"
+            multiple
+            v-model="form.tagOrgTypes"
+            placeholder="请选择下发机构类型"
             :disabled="!isSubmit"
             style="width: 100%"
-            @change="execOrgTypeChanged()"
           >
             <el-option
               v-for="dict in dict.type.sys_org_type"
@@ -322,9 +322,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="目标机构" prop="tagOrgIds">
-          <!--          <org-tree-select :queryData="form.tagOrgType" ref="orgTreeSelect" @selectNode="queryNode"
-                           :placeholder="'请选择目标机构'" :disable="true"></org-tree-select>-->
+<!--        <el-form-item label="目标机构" prop="tagOrgIds">
           <org-tree-select
             trigger="hover"
             v-model="form.tagOrgIds"
@@ -337,7 +335,6 @@
           >
           </org-tree-select>
         </el-form-item>
-        <!-- </el-form-item>-->
         <el-form-item label="目标角色" v-if="isShow" prop="tagRoleIds"
                       :rules="{required: isShow?true:false, message: '请选择目标角色', trigger: 'blur'}">
           <el-select
@@ -353,7 +350,7 @@
               :value="item.id"
             ></el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item>-->
 
         <el-form-item label="内容" prop="content">
           <el-input
@@ -447,17 +444,17 @@ export default {
       // 表单参数
       form: {
         title: null,
-        messagType: null,
-        tagOrgType: null,
-        tagOrgIds: [],
+        // messagType: null,
+        tagOrgTypes: [],
+        // tagOrgIds: [],
         content: null
       },
       // 表单校验
       rules: {
         title: [{required: true, message: "请输入标题"}],
-        messagType: [{required: true, message: "请选择消息类型"}],
-        tagOrgType: [{required: true, message: "请选择机构类型"}],
-        tagOrgIds: [{required: true, message: "请选择目标机构", trigger: 'change'}],
+       /* messagType: [{required: true, message: "请选择消息类型"}],*/
+        tagOrgTypes: [{required: true, message: "请选择机构类型"}],
+       /* tagOrgIds: [{required: true, message: "请选择目标机构", trigger: 'change'}],*/
         content: [{required: true, message: "请输入内容"}],
       },
     };
@@ -470,7 +467,7 @@ export default {
     this.loginOrgId = this.$store.getters.orgId;
     this.queryParams.orgId = this.$store.getters.orgId;
     this.getList();
-    this.initRoleList();
+   /* this.initRoleList();*/
   },
   methods: {
     selectNodeId(val){
@@ -570,11 +567,11 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-      this.initRoleList();
+     /* this.initRoleList();*/
       this.formFileListDefualtValue = [];
       this.open = true;
       this.isShow = false;
-      this.title = "添加公告通知";
+      this.title = "新增通知公告";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -588,12 +585,12 @@ export default {
         if (this.form.messagType == 1) {
           this.isShow = true;
         }
-        roleList(this.form.tagOrgType).then((res) => {
+/*        roleList(this.form.tagOrgType).then((res) => {
           this.roleList = res.data;
-        });
+        });*/
         this.formFileListDefualtValue = this.form.fileList;
         this.open = true;
-        this.title = "编辑公告通知";
+        this.title = "编辑通知公告";
       });
     },
     lookThisOne(row) {
@@ -608,9 +605,9 @@ export default {
         /*    if(this.form.tagRoleIds!=null&&this.form.tagRoleIds.length>0){
           this.isShow=true;
         }*/
-        roleList(this.form.tagOrgType).then((res) => {
+  /*      roleList(this.form.tagOrgType).then((res) => {
           this.roleList = res.data;
-        });
+        });*/
         this.formFileListDefualtValue = this.form.fileList;
         this.open = true;
         this.title = "公告通知详情";
@@ -625,7 +622,6 @@ export default {
             updateNotification(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
-              this.$refs.orgTreeSelect.clear();
               this.reset();
               this.$refs["upload"].clearFiles();
               this.form.fileList = [];
@@ -635,7 +631,6 @@ export default {
             addNotification(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
-              this.$refs.orgTreeSelect.clear();
               this.reset();
               this.form.fileList = [];
               this.$refs["upload"].clearFiles();
@@ -699,18 +694,18 @@ export default {
       this.orgName = data.name;
       this.handleQuery();
     },
-    execOrgTypeChanged(row) {
+/*    execOrgTypeChanged(row) {
       this.form.tagRoleIds = [];
       this.$refs.orgTreeSelect.clear();
       this.initRoleList(this.form.tagOrgType);
-    },
-    initRoleList(query) {
+    },*/
+/*    initRoleList(query) {
       this.form.tagRoleIds = [];
       roleList(query).then((response) => {
         this.roleList = response.data;
         this.roleListInit = response.data;
       });
-    },
+    },*/
 
     showOrHidden() {
       if (this.form.messagType == "1") {

src/views/core/outIn/letter/dialog.addletter.vue

@@ -241,7 +241,7 @@ export default {
       open: false,
       userInfo: this.resetUserInfo(),
       imageList: [],
-      letterFileType:["pdf", "jpg", "png", "bmp"]
+      letterFileType:["jpg", "png", "bmp"]
     };
   },
   dicts: ["letter_status","letter_id_type"],

src/views/resumption/plan/index.vue

@@ -288,7 +288,7 @@
               v-if="false"
             ></el-table-column>
 
-            <el-table-column fixed="right" width="210" label="操作">
+            <el-table-column fixed="right" align="center" width="210" label="操作">
               <template slot-scope="r">
                 <el-button
                   size="mini"

src/views/system/bind/index.vue

@@ -395,7 +395,7 @@ export default {
   },
 
   created() {
-   // this.getDeptTree();
+    this.getDeptTree();
   },
 
   methods: {
@@ -488,20 +488,20 @@ export default {
     },
 
     /** 查询部门下拉树结构 */
-    // getDeptTree() {
-    //   // deptTreeSelect().then(response => {
-    //   //   this.deptOptions = response.data;
-    //   //   this.defaultKeys.push(response.data[0].id);
-    //   //   this.queryParams.orgId = response.data[0].id;
-    //   //   this.handleQuery();
-    //   // });
-    //   businessTreeSelect().then((response) => {
-    //     this.deptOptions = response.data;
-    //     this.defaultKeys.push(response.data[0].id);
-    //     this.queryParams.orgId = response.data[0].id;
-    //     this.handleQuery();
-    //   });
-    // },
+    getDeptTree() {
+      // deptTreeSelect().then(response => {
+      //   this.deptOptions = response.data;
+      //   this.defaultKeys.push(response.data[0].id);
+      //   this.queryParams.orgId = response.data[0].id;
+      //   this.handleQuery();
+      // });
+      businessTreeSelect().then((response) => {
+        this.deptOptions = response.data;
+        this.defaultKeys.push(response.data[0].id);
+        this.queryParams.orgId = response.data[0].id;
+        this.handleQuery();
+      });
+    },
     tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {
         delete node.children;

src/views/system/dept/extend.vue

@@ -252,8 +252,8 @@
                   :value="dict.value"
                 ></el-option>
               </el-select>
-            </el-descriptions-item> 
-    
+            </el-descriptions-item>
+
             <el-descriptions-item v-if="type === org_type.yewd" labelClassName="gx_info_label" label="是否配备保安人员">
               <el-radio-group v-model="askari">
                 <el-radio :label="1">是</el-radio>
@@ -492,7 +492,7 @@
     uploadFile,
   } from "@/api/system/extend";
 
-  import { 
+  import {
     listDept,
     getDept,
     delDept,
@@ -511,6 +511,8 @@
   import {selectCityInfoVoList} from "@/api/core/weather";
   import TreeNodeDialogVue from "../../tool/build/TreeNodeDialog.vue";
 export default {
+  fillter: {},
+
   dicts: [
   "duty_options",
     "sys_org_type",
@@ -525,10 +527,9 @@ export default {
     "org_extend_detached_standard",
     "org_extend_is",
     "property_situation",
+  
   ],
 
-  fillter: {},
-
   components: {
     ImgsUpload,
     "el-image-viewer": () =>
@@ -558,7 +559,7 @@ export default {
       rules: {
         type: [{required: true, message: "请选择机构类型", trigger: "change"}],
         standard: [{required: true, message: "请选择标准", trigger: "change"}],
-        certificate: [{required: true, message: "请选择上传证书", trigger: "change"}],
+      //  certificate: [{required: true, message: "请选择上传证书", trigger: "change"}],
       },
       remoteCountoptions: [
         {label: "0", value: 0},
@@ -1309,7 +1310,6 @@ export default {
     orgcancel() {
       console.log(this.orgform.certificate,123123);
       console.log(  this.orgimgs,'123123');
-      debugger
       this.orgopen = false;
       this.orgform.certificate=null;
       this.orgimgs=null;
@@ -1339,8 +1339,8 @@ export default {
     },
     /** 提交按钮 */
     submitOrgForm() {
-        
-      console.log(this.orgform.certificate,'this.orgform.certificate')
+
+      console.log(this.orgform.certificate, 'this.orgform.certificate')
       if (this.orgform.certificate > 0) {
         //this.orgform.certificate = this.orgimgs[this.orgimgs.length - 1].toString(",");
       }
@@ -1351,6 +1351,10 @@ export default {
       //certificate
       this.$refs.orgform.validate((valid) => {
         if (valid) {
+          if (this.orgform.standard !== '3' && (this.orgform.certificate == null||this.orgform.certificate == 0)) {
+            this.$modal.alertError("请上传证书");
+            return;
+          }
           // 表单验证通过，提交数据或执行其他操作
           this.orgform.orgId = this.$route.params.id;
           // this.orgform.type = 1;

src/views/system/user/index.vue

@@ -296,10 +296,10 @@
                   <el-button
                     size="mini"
                     type="text"
-                    v-if="scope.row.isManage == 'Y'"
+                    v-show="scope.row.isManage == 'Y'"
                     icon="el-icon-plus"
                     @click="handleExtend(scope.row)"
-                    v-hasPermi="['system:user:extend']"
+                    v-hasPermi="['system:information:edit']"
                     >补充信息</el-button
                   >
                   <el-button
@@ -343,14 +343,14 @@
       </el-col>
     </el-row>
   <!-- 重置密码对话框 -->
-    <DialogCom :title="title" :visible.sync="close" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <DialogCom :title="title" :visible.sync="close"  width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules">
         <el-row>
        
           <el-col :span="10">
-            <el-form-item  label="密码" prop="password" >
+            <el-form-item  label="密码" prop="password" label-width="100PX">
               <el-input
-              style="width: 317px;"
+              style="width: 500px;"
                 v-model="form.password"
                 placeholder="请输入密码"
                 autocomplete="off"
@@ -579,15 +579,17 @@ import { getInfo } from "@/api/login";
 import { getRoles } from "@/api/system/public";
 import request from "@/utils/request";
 export default {
-  name: "User",
   dicts: [
     "sys_normal_disable",
     "sys_user_sex",
     "sys_user_is_lock",
     "sys_yes_no",
   ],
-  components: { OrgTree },
+
+  name: "User",
   mixins: [tableList],
+  components: { OrgTree },
+
   data() {
     return {
       defaultProps: {
@@ -734,10 +736,6 @@ export default {
     };
   },
 
-  created() {},
-  mounted() {
-    this.getAllRoles();
-  },
   watch: {
     // 'form.orgId'(newValue) {
     //   if (this.isRoleIdsChanged) {
@@ -760,6 +758,13 @@ export default {
     //   deep: true
     // }
   },
+
+  created() {},
+
+  mounted() {
+    this.getAllRoles();
+  },
+
   methods: {
     changeRoleIds() {
       //手动关闭下拉框
@@ -1196,8 +1201,9 @@ export default {
       // console.log(this.$refs.upload.getFile(),"this.$refs.upload")
       this.$refs.upload.submit();
     },
-  },
+  }
 };
 </script>
+
 <style lang="scss"></style>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped></style>