luowei修改bug

src/api/resumption/configuration.js

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 修改【请填写功能名称】
+export function insertConfiguration(data) {
+    return request({
+      url: '/core/configuration',
+      method: 'post',
+      data: data
+    })
+  }

src/views/information/configuration/index.vue

@@ -20,7 +20,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="营业中提醒：" prop="centre">
-              <el-input-number size="mini" style="width: 70%;" v-model="day.z" @change="handleChange" :min="1" :max="10"
+              <el-input-number size="mini" style="width: 70%;" v-model="day.centre" @change="handleChange" :min="1" :max="10"
                 label="描述文字"></el-input-number>
               分钟
             </el-form-item>
@@ -28,14 +28,14 @@
 
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="营业后提醒：" prop="after">
-              <el-input-number size="mini" style="width: 70%;" v-model="day.h" @change="handleChange" :min="1" :max="10"
+              <el-input-number size="mini" style="width: 70%;" v-model="day.after" @change="handleChange" :min="1" :max="10"
                 label="描述文字"></el-input-number>
               分钟
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="5">
             <el-form-item label="全天提醒：" prop="allDay">
-              <el-input-number size="mini" style="width: 70%;" v-model="day.all" @change="handleChange" :min="1" :max="10"
+              <el-input-number size="mini" style="width: 70%;" v-model="day.allDay" @change="handleChange" :min="1" :max="10"
                 label="描述文字"></el-input-number>
               分钟
             </el-form-item>
@@ -138,11 +138,13 @@
 </template>
 
 <script>
+import { insertConfiguration } from "@/api/resumption/configuration";
 export default {
   props: [],
   components: {},
   data() {
     return {
+      
       num: 1,
       day: {
         resumptionCycle: 1,
@@ -219,6 +221,7 @@ export default {
       },
     }
   },
+  
   watch: {},
   computed: {},
   beforeCreate() { },
@@ -228,27 +231,50 @@ export default {
   beforeUpdate() { },
   updated() { },
   destroyed() { },
+  
   methods: {
     request() { },
     handleChange(value) { },
     hello() {
       alert("来自预设逻辑代码的问候")
     },
-    saveExtend() {
-      // this.formData.userId = this.$route.params.userId;
+    
+    // saveExtend() {
+    //   // this.formData.userId = this.$route.params.userId;
+
+    //   this.$refs['form'].validate((valid) => {
+    //     if (valid) {
+    //       extendUserInformation(this.formData).then(res => {
+    //         this.$message.success('保存成功！')
+    //         this.$router.go(-1)
+    //       })
+    //     }
+    //   });
 
-      this.$refs['form'].validate((valid) => {
+    // },
+    
+    saveExtend() {
+      debugger
+      this.$refs["day"].validate(valid => {
         if (valid) {
-          extendUserInformation(this.formData).then(res => {
-            this.$message.success('保存成功！')
-            this.$router.go(-1)
-          })
+          if (this.day.id != null) {
+            updateArea(this.day).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            debugger
+            insertConfiguration(this.day).then(response=>{
+                  this.$modal.msgSuccess("新增成功");
+               this.open = false;
+              
+            })
+          }
         }
       });
-
     },
 
-
   },
   fillter: {},
 }

src/views/system/area/index.vue

@@ -119,7 +119,7 @@
     <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="name">
-          <el-input v-model="form.name" placeholder="请输入区域名称" />
+          <el-input maxlength="50" v-model="form.name" placeholder="请输入区域名称" />
         </el-form-item>
 
 

src/views/system/bind/index.vue

@@ -66,7 +66,7 @@
 
           <el-table-column label="区域名称" align="center" prop="areaName" />
 
-          <el-table-column label="采集点名称" align="center" prop="collectionAreaName" />
+          <el-table-column label="NFC点位名称" align="center" prop="collectionAreaName" />
           <el-table-column label="标签编号" align="center" prop="code" />
 
           <el-table-column prop="status" label="状态" width="80">
@@ -107,7 +107,7 @@
         <el-row>
           <el-col :span="30">
             <el-form-item label="机构名称" prop="orgId">
-              <treeselect v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
+              <treeselect @blur="closeOptions()" v-model="form.orgId" :options="deptOptions" :show-count="true" :normalizer="tenantIdnormalizer"
                 :props="{ checkStrictly: true, label: 'name' }" placeholder="请选择机构" @select="changeSelectArea" />
             </el-form-item>
           </el-col>
@@ -116,7 +116,7 @@
         <el-row>
           <el-col :span="20">
             <el-form-item label="区域名称" prop="areaId">
-              <el-select v-model="form.areaId" placeholder="请选择区域名称" @change="changeSelect">
+              <el-select ref="fuzzySearch"  mode="multiple" 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>
@@ -125,8 +125,8 @@
 
         <el-row>
           <el-col :span="20">
-            <el-form-item label="采集点名称" prop="checkId">
-              <el-select v-model="form.checkId" placeholder="请选择采集点名称">
+            <el-form-item label="NFC点位名称" prop="checkId">
+              <el-select 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>
@@ -220,7 +220,7 @@ export default {
           { required: true, message: '请选择归属部门', trigger: 'blur' },
         ],
         checkId: [
-          { required: true, message: '请选择采集点', trigger: 'blur' }
+          { required: true, message: '请选择NFC点位名称', trigger: 'blur' }
         ],
         code: [
           { required: true, message: '请输入标签编号', trigger: 'change' }
@@ -251,6 +251,10 @@ export default {
     }
   },
   methods: {
+closeOptions(){
+  this.$refs.fuzzySearch[0].blur()
+},
+
     /** 下穿状态改变*/
     changeCheckBox() {
       this.getList();

src/views/system/check/index.vue

@@ -20,8 +20,8 @@
 
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="采集点名称" prop="checkName">
-            <el-input v-model="queryParams.checkName" placeholder="请输入采集点名称" clearable
+          <el-form-item label="NFC点位名称" prop="checkName">
+            <el-input v-model="queryParams.checkName" placeholder="请输入NFC点位名称" clearable
               @keyup.enter.native="handleQuery" />
           </el-form-item>
           <el-form-item label="区域名称" prop="areaId">
@@ -60,7 +60,7 @@
         </el-row>
         <el-table v-loading="loading" :data="checkList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" />
-          <el-table-column label="采集点名称" align="center" prop="checkName" />
+          <el-table-column label="NFC点位名称" align="center" prop="checkName" />
           <el-table-column label="区域名称" align="center" prop="areaName" />
           <el-table-column label="归属部门" align="center" prop="orgName" />
           <el-table-column label="修改人" align="center" prop="updateBy" />
@@ -101,8 +101,8 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="采集点名称" prop="checkName">
-          <el-input v-model="form.checkName" placeholder="请输入采集点名称" />
+        <el-form-item label="NFC点位名称" prop="checkName">
+          <el-input v-model="form.checkName" placeholder="请输入NFC点位名称" />
         </el-form-item>
         <el-row>
  
@@ -190,7 +190,7 @@ export default {
           { required: true, message: '请选择归属部门', trigger: 'blur' },
         ],
         checkName: [
-          { required: true, message: '请输入采集点名称', trigger: 'change' }
+          { required: true, message: '请输入NFC点位名称', trigger: 'change' }
         ],
       },
       defaultKeys: []
@@ -352,7 +352,7 @@ export default {
     handleDelete(row) {
       const ids = row.id || this.ids;
       const names = row.checkName || this.names
-      this.$modal.confirm('是否确认删除区域采集点名称为"' + names + '"的数据项？').then(function () {
+      this.$modal.confirm('是否确认删除区域NFC点位名称为"' + names + '"的数据项？').then(function () {
         return delCheck(ids);
       }).then(() => {
         this.getList();

src/views/system/role/index.vue

@@ -61,6 +61,7 @@
               <dict-tag :options="dict.type.sys_org_type" :value="scope.row.orgType" />
             </template>
           </el-table-column>
+          <el-table-column label="更新人" prop="createBy" :show-overflow-tooltip="true"  />
 <!--      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true"  />-->
       <el-table-column label="状态" align="center" >
         <template slot-scope="scope">
@@ -143,7 +144,7 @@
           </div>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input v-model="form.remark" maxlength="200" type="textarea" placeholder="请输入内容"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

src/views/system/user/extend.vue

@@ -74,17 +74,20 @@
 
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item label="初级以上相关专业技术职业资格" prop="professionalQualifications">
-              <el-input style="width: 217px;" v-model="formData.professionalQualifications" placeholder="请输入">
+              <el-input style="width: 217px;" maxlength="50" v-model="formData.professionalQualifications" placeholder="请输入">
               </el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
+   
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item label="持证上岗未通过原因" prop="certificateFailReason">
-              <el-input style="width: 217px;" v-model="formData.certificateFailReason" placeholder="请输入">
-              </el-input>
+              <el-select style="width: 217px;" v-model="formData.certificateFailReason" placeholder="请选择">
+                <el-option v-for="dict in dict.type.post_no_pass" :key="dict.value" :label="dict.label"
+                  :value="dict.value" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
@@ -143,7 +146,7 @@
       </el-form>
     </div>
     <div style="margin-top: 50px; margin-left: 42%">
-      <el-button type="primary" @click="saveExtend" size="small">提交</el-button>
+      <el-button type="primary" @click="saveExtend" v-hasPermi="['system:information:edit']" size="small">提交</el-button>
       <el-button type="primary" @click="nosaveExtend" size="small">取消</el-button>
     </div>
 
@@ -163,7 +166,7 @@ import { extendUserInformation } from "@/api/system/information";
 export default {
   props: [],
   components: { TreeSelect },
-  dicts: ['sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type'],
+  dicts: ['sys_highest_education', "sys_work_type", "sys_duties", "sys_education_type", 'sys_department_type','post_no_pass'],
   data() {
     return {
       startDatepickerOptions: {
@@ -249,8 +252,8 @@ export default {
         professionalQualifications: [
           { required: true, message: '请输入初级以上相关专业技术职业资格', trigger: 'change' }
         ],
-        date1: [
-          { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+        certificateFailReason: [
+        { required: true, message: '请输入持证上岗未通过原因', trigger: 'change' }
         ],
         date2: [
           { type: 'date', required: true, message: '请选择时间', trigger: 'change' }