luojun 2 жил өмнө
parent
commit
c25b031482

+ 1 - 0
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;

+ 1 - 1
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"
     >

+ 22 - 15
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

+ 6 - 0
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);

+ 3 - 3
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"