feige
2 天以前 7706412d104e452b917ec132dcd9377680a83449
添加了代码
5个文件已修改
352 ■■■■ 已修改文件
src/api/system/archiverecordstouser.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/archiveManager/arMAutoUser.vue 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/archiveManager/archiveMaterial/index.vue 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/archiveManager/index.vue 266 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/archiveManager/seleUser.vue 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/system/archiverecordstouser.js
@@ -50,3 +50,19 @@
    params: data
  })
}
// 删除【请填写功能名称】
export function delArchiverecordstouserByReIdAndUid(data) {
  return request({
    url: '/system/archiverecordstouser/deleteByRidUid',
    method: 'delete',
    params: data
  })
}
//判断是否已经授权
export function getArchiverecordstouserByReIdAndUid(data) {
  return request({
    url: '/system/archiverecordstouser/getByRidUid',
    method: 'get',
    params: data
  })
}
src/views/archiveManager/arMAutoUser.vue
@@ -105,14 +105,15 @@
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
    <select-user ref="select" :roleId="queryParams.roleId" :recordId="queryParams.recordId" @ok="handleQuery" />
    <select-user ref="select" :roleId="queryParams.roleId" :recordId="queryParams.archiveRecordsId" @ok="handleQuery" />
  </div>
</template>
<script>
import {UserRoleIdList, allocatedUserList, authUserCancel, authUserCancelAll } from "@/api/system/role"
import selectUser from "./seleUser"
import {listArchiverecordstouser,addArchiverecordstouser} from "@/api/system/archiverecordstouser"
  import { listMaterials, getMaterials, delMaterials, addMaterials, updateMaterials,getArchiverecordstouserByReIdAndUid } from "@/api/system/materials"
import {listArchiverecordstouser,addArchiverecordstouser,delArchiverecordstouserByReIdAndUid} from "@/api/system/archiverecordstouser"
export default {
  name: "AuthUser1",
  dicts: ['sys_normal_disable'],
@@ -137,16 +138,17 @@
        pageNum: 1,
        pageSize: 10,
        roleId: undefined,
        archiveRecordsId: undefined
      //  userName: undefined,
      //  phonenumber: undefined
        archiveRecordsId: undefined,
        // SysUser.userName: undefined,
        // phonenumber: undefined
      }
    }
  },
  created() {
    const roleId = this.$route.params && this.$route.params.roleId
    const recordId = this.$route.params && this.$route.params.archiveRecordsId
    alert(recordId)
    if (roleId&&recordId) {
      this.queryParams.roleId = roleId
      this.queryParams.archiveRecordsId = recordId
@@ -189,13 +191,19 @@
    },
    /** 打开授权用户表弹窗 */
    openSelectUser() {
      this.$refs.select.show()
      // alert(this.queryParams.roleId)
      // alert(this.queryParams.archiveRecordsId )
      this.$refs.select.show(this.queryParams.archiveRecordsId)
    },
    /** 取消授权按钮操作 */
    cancelAuthUser(row) {
      const roleId = this.queryParams.roleId
      this.$modal.confirm('确认要取消该用户"' + row.userName + '"角色吗?').then(function() {
        return authUserCancel({ userId: row.userId, roleId: roleId })
      const recordId = this.queryParams.archiveRecordsId
      var userId = row.userId
      // alert(userId)
      // alert(this.queryParams.archiveRecordsId)
      // alert(row.sysUser.userName)
      this.$modal.confirm('确认要取消该用户"' + row.sysUser.userName + '"授权吗?').then(function() {
        return delArchiverecordstouserByReIdAndUid({  recordId: recordId, userId: userId   })
      }).then(() => {
        this.getList()
        this.$modal.msgSuccess("取消授权成功")
src/views/archiveManager/archiveMaterial/index.vue
@@ -195,6 +195,17 @@
            @click="handleExport"
            v-hasPermi="['system:materials:export']"
          >导出</el-button>
          <el-col :span="1.5">
          <el-button
            type="success"
            plain
            icon="el-icon-edit"
            size="mini"
            :disabled="single"
            @click="handleUpdate"
            v-hasPermi="['system:materials:edit']"
          >全部附件导入</el-button>
        </el-col>
        </el-col>
        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
      </el-row>
src/views/archiveManager/index.vue
@@ -70,12 +70,21 @@
        </el-select>
      </el-form-item>
      <el-form-item label="密级" prop="securityClassification">
        <el-input
        <el-select
          v-model="queryParams.securityClassification"
          placeholder="请输入密级"
          placeholder="请选择密级"
          clearable
          @keyup.enter.native="handleQuery"
        />
        >
          <el-option
            v-for="item in securityLevelOptions"
            :key="item.value"
            :label="item.label"
            :value="item.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="案卷页数" prop="pageCount">
        <el-input
@@ -235,17 +244,29 @@
      <el-table-column label="缩微号" align="center" prop="microfilmNumber" />
      <el-table-column label="备注" align="center" prop="remarks" />
      <el-table-column label="历史相关发文号" align="center" prop="historicalReferenceNumber" />
      <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
      <el-table-column label="操作" align="center" width="190" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
          v-if="scope.row.ownData"
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleInfo(scope.row)"
            v-hasPermi="['system:records:edit']"
          >案卷详细信息</el-button>
          <el-button
          v-if="scope.row.ownData||scope.row.userId==1"
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleCheck(scope.row)"
          >查看</el-button>
          <el-button
          v-if="scope.row.ownData||userId===1"
            size="mini"
            type="text"
@@ -260,7 +281,7 @@
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:records:remove']"
          >删除</el-button>
          <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
          <el-dropdown size="mini" v-hasPermi="['system:records:remove']" @command="(command) => handleCommand(command, scope.row)">
            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
            <el-dropdown-menu slot="dropdown">
@@ -279,19 +300,127 @@
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
    <!--  查看数据按钮  -->
    <el-dialog :title="title" :visible.sync="open_check" width="800px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-form-item label="档案号" >
<el-row :gutter="8">
  <el-col :span="6">
    <el-select
      v-model="form.recordType"
      placeholder="选择档案类型"
      disabled
      @change="handleRecordTypeChange"
    >
      <el-option
        v-for="item in recordTypeOptions"
        :key="item.value"
        :label="item.label"
        :value="item.value"
      />
    </el-select>
  </el-col>
  <el-col :span="6">
    <el-input
      v-model="form.recordYear"
      placeholder="输入年份"
      disabled
      @input="generateRecordId"
    />
  </el-col>
  <el-col :span="6">
    <el-input
      v-model="form.recordSeq"
      placeholder="自动生成"
      disabled
    />
  </el-col>
</el-row>
        </el-form-item>
        <el-form-item label="发文号" prop="inquiryNumber">
          <el-input v-model="form.inquiryNumber" placeholder="请输入发问号" disabled/>
        </el-form-item>
        <el-form-item label="建设项目名称" prop="projectName">
          <el-input v-model="form.projectName" placeholder="请输入建设项目名称" disabled/>
        </el-form-item>
        <div v-if="vis">
        <el-form-item label="案卷题名" prop="caseTitle">
          <el-input v-model="form.caseTitle" placeholder="请输入案卷题名" disabled/>
        </el-form-item>
        <el-form-item label="公开属性" prop="publicAttribute">
          <el-input v-model="form.publicAttribute" placeholder="请输入公开属性" disabled />
        </el-form-item>
        <el-form-item label="编制单位" prop="preparationUnit">
          <el-input v-model="form.preparationUnit" placeholder="请输入编制单位" disabled/>
        </el-form-item>
        <el-form-item label="编制日期" prop="preparationDate">
          <el-date-picker clearable
            v-model="form.preparationDate"
            type="date"
            disabled
            value-format="yyyy-MM-dd"
            placeholder="请选择编制日期">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="保管期限" prop="retentionPeriod">
          <el-input v-model="form.retentionPeriod" placeholder="请输入保管期限" disabled/>
        </el-form-item>
        <el-form-item label="密级" prop="securityClassification">
          <el-input v-model="form.securityClassification" placeholder="请输入密级" disabled/>
        </el-form-item>
        <el-form-item label="案卷页数" prop="pageCount">
          <el-input v-model="form.pageCount" placeholder="请输入案卷页数" disabled/>
        </el-form-item>
        <el-form-item label="立案号" prop="filingNumber">
          <el-input v-model="form.filingNumber" placeholder="请输入立案号" disabled/>
        </el-form-item>
        <el-form-item label="建设单位" prop="constructionUnit">
          <el-input v-model="form.constructionUnit" placeholder="请输入建设单位" disabled />
        </el-form-item>
        <el-form-item label="建设地址" prop="constructionAddress">
          <el-input v-model="form.constructionAddress" placeholder="请输入建设地址" disabled/>
        </el-form-item>
        <el-form-item label="项目编号" prop="projectNumber">
          <el-input v-model="form.projectNumber" placeholder="请输入项目编号" disabled/>
        </el-form-item>
        <el-form-item label="扫描加工公司" prop="scanningCompany">
          <el-input v-model="form.scanningCompany" placeholder="请输入扫描加工公司" disabled/>
        </el-form-item>
        <el-form-item label="档案管(室)号" prop="archiveRoomNumber">
          <el-input v-model="form.archiveRoomNumber" placeholder="请输入档案管(室)号" disabled/>
        </el-form-item>
        <el-form-item label="缩微号" prop="microfilmNumber">
          <el-input v-model="form.microfilmNumber" placeholder="请输入缩微号" disabled/>
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" disabled/>
        </el-form-item>
        <el-form-item label="历史相关发文号" prop="historicalReferenceNumber">
          <el-input v-model="form.historicalReferenceNumber" placeholder="请输入历史相关发文号" disabled/>
        </el-form-item>
        </div>
      </el-form>
    </el-dialog>
    <!-- 添加或修改档案记录对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
    <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-form-item label="档案号" >
        <el-row :gutter="8">
          <el-col :span="6">
            <el-select
              v-model="form.recordType"
              placeholder="选择档案类型"
              @change="handleRecordTypeChange"
            >
              :disabled="userId!=1"              >
              <el-option
                v-for="item in recordTypeOptions"
                :key="item.value"
@@ -305,6 +434,7 @@
              v-model="form.recordYear"
              placeholder="输入年份"
              @input="generateRecordId"
:disabled="userId!=1"
            />
          </el-col>
          <el-col :span="6">
@@ -317,18 +447,33 @@
        </el-row>
        </el-form-item>
        <el-form-item label="发文号" prop="inquiryNumber">
          <el-input v-model="form.inquiryNumber" placeholder="请输入发问号" />
          <el-input v-model="form.inquiryNumber" placeholder="请输入发问号"   :disabled="userId!=1"
          />
        </el-form-item>
        <el-form-item label="建设项目名称" prop="projectName">
          <el-input v-model="form.projectName" placeholder="请输入建设项目名称" />
          <el-input v-model="form.projectName" placeholder="请输入建设项目名称" :disabled="userId!=1"/>
        </el-form-item>
        <div v-if="vis">
        <el-form-item label="案卷题名" prop="caseTitle">
          <el-input v-model="form.caseTitle" placeholder="请输入案卷题名" />
        </el-form-item>
        <el-form-item label="公开属性" prop="publicAttribute">
          <el-input v-model="form.publicAttribute" placeholder="请输入公开属性" />
          <el-select
            v-model="form.publicAttribute"
            placeholder="请选择公开属性"
            clearable
          >
            <el-option
              v-for="item in publicAttributeOptions"
              :key="item.value"
              :label="item.label"
              :value="item.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="编制单位" prop="preparationUnit">
          <el-input v-model="form.preparationUnit" placeholder="请输入编制单位" />
        </el-form-item>
@@ -341,10 +486,32 @@
          </el-date-picker>
        </el-form-item>
        <el-form-item label="保管期限" prop="retentionPeriod">
          <el-input v-model="form.retentionPeriod" placeholder="请输入保管期限" />
          <el-select
            v-model="form.retentionPeriod"
            placeholder="请选择保管期限"
            clearable
          >
            <el-option
              v-for="item in retentionPeriodOptions"
              :key="item.value"
              :label="item.label"
              :value="item.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="密级" prop="securityClassification">
          <el-input v-model="form.securityClassification" placeholder="请输入密级" />
          <el-select
            v-model="form.securityClassification"
            placeholder="请选择密级"
            clearable
          >
            <el-option
              v-for="item in securityLevelOptions"
              :key="item.value"
              :label="item.label"
              :value="item.value"
            />
          </el-select>
        </el-form-item>
        <el-form-item label="案卷页数" prop="pageCount">
          <el-input v-model="form.pageCount" placeholder="请输入案卷页数" />
@@ -395,6 +562,11 @@
  name: "Records",
  data() {
    return {
      open_check: false,
      securityLevelOptions: [
        { value: '秘密', label: '秘密' },
        { value: '普通', label: '普通' }
      ],
      maxId: 0,
            // 档案类型选项
            recordTypeOptions: [],
@@ -411,7 +583,8 @@
        { value: "免予公开", label: "免予公开" }
      ],
      amio: false,
      vis: false,
      userId: null,
      vis: true,
      // 遮罩层
      loading: true,
      // 选中数组
@@ -474,7 +647,9 @@
  },
  created() {
    this.getList()
    this.userId = this.$store.state.user.id;
// 获取用户角色
    this.getId()
    this.getRecordTypes()
@@ -483,27 +658,28 @@
  methods: {
    getId()
    {
      var _this = this;
      var _this = this;
      getMaxId().then(response=>{
      //  alert(213)
        console.log(response)
        _this.maxId = String(response.data).padStart(5, '0')
        _this.$set(_this.form, 'recordSeq', _this.maxId) //
        _this.$set(_this.form, 'recordSeq', _this.maxId) //
          //      alert(this.maxId)
      })
    },
       /** 获取档案类型列表 */
       getRecordTypes() {
      listAllCategory().then(response => {
        console.log(response)
        console.log("----=============--------------")
        this.recordTypeOptions = response.data.map(item => ({
          value: item.numb,
          label: item.nname
        }))
      })
        return new Promise((resolve) => {
    listAllCategory().then(response => {
      this.recordTypeOptions = response.data.map(item => ({
        value: item.numb,
        label: item.nname
      }))
      resolve()
    })
  })
    },
    /** 档案类型变更处理 */
@@ -513,7 +689,7 @@
    /** 生成档案号 */
    generateRecordId() {
      if (this.form.recordType && this.form.recordYear) {
        // getNextRecordId({
        //   type: this.form.recordType,
@@ -599,7 +775,7 @@
      var mid = row.id
      const roleId = 2
      alert(mid)
   //   alert(mid)
      var recordId = mid
    //  this.$router.push("/archiveManager/infoManagerAu/user/" + roleId+"/"+recordId)
      this.$router.push("/archiveManager/infoManagerAu/archiveMaterialManager/" + recordId)
@@ -609,16 +785,44 @@
    handleUpdate(row) {
      this.reset()
      this.vis = true;
      if(this.userId===1)
        this.vis = false;
      const id = row.id || this.ids
      getRecords(id).then(response => {
        console.log(response)
        console.log("----=============--------------")
        this.form = response.data
  // 确保recordTypeOptions已加载
  if(this.recordTypeOptions.length > 0) {
      const recordParts = response.data.recordId.split('-')
      this.$set(this.form, 'recordType', recordParts[0])
      this.$set(this.form, 'recordYear', recordParts[1])
      this.$set(this.form, 'recordSeq', recordParts[2])
    }
        this.open = true
        this.title = "修改档案记录"
      })
    },
    /** 修改按钮操作 */
    handleCheck(row) {
this.vis = true;
const id = row.id || this.ids
getRecords(id).then(response => {
  console.log(response)
  console.log("----=============--------------")
  this.form = response.data
  if(this.recordTypeOptions.length > 0) {
      const recordParts = response.data.recordId.split('-')
      this.$set(this.form, 'recordType', recordParts[0])
      this.$set(this.form, 'recordYear', recordParts[1])
      this.$set(this.form, 'recordSeq', recordParts[2])
    }
  this.open_check = true
  this.title = "查看档案记录"
})
},
    /** 提交按钮 */
    submitForm() {
      this.$refs["form"].validate(valid => {
@@ -634,6 +838,8 @@
              this.$modal.msgSuccess("新增成功")
              this.open = false
              this.getList()
              this.getId()
            })
          }
        }
src/views/archiveManager/seleUser.vue
@@ -57,7 +57,7 @@
</template>
<script>
  import {listArchiverecordstouser,addArchiverecordstouser,authRecordToUser} from "@/api/system/archiverecordstouser"
  import {listArchiverecordstouser,addArchiverecordstouser,authRecordToUser,getArchiverecordstouserByReIdAndUid} from "@/api/system/archiverecordstouser"
import { UserRoleIdList,unallocatedUserList, authUserSelectAll } from "@/api/system/role"
export default {
@@ -67,7 +67,7 @@
    roleId: {
      type: [Number, String]
    },
    recordId: {
    archiveRecordsId: {
      type: [Number, String]
    }
  },
@@ -86,7 +86,7 @@
        pageNum: 1,
        pageSize: 10,
        roleId: undefined,
        recordId: undefined,
        archiveRecordsId: undefined,
        userName: undefined,
        phonenumber: undefined
      }
@@ -94,9 +94,13 @@
  },
  methods: {
    // 显示弹框
    show() {
    show(archiveRecordsId) {
      if (archiveRecordsId) {
    this.archiveRecordsId = archiveRecordsId
  }
      this.queryParams.roleId = this.roleId
      this.queryParams.recordId = this.recordId
      this.queryParams.archiveRecordsId = this.archiveRecordsId
      this.getList()
      this.visible = true
    },
@@ -128,19 +132,22 @@
    },
    /** 选择授权用户操作 */
    handleSelectUser() {
      const recordId = this.queryParams.recordId
      const archiveRecordsId = this.queryParams.archiveRecordsId
      const userIds = this.userIds.join(",")
      alert(recordId)
      alert(userIds)
      if (userIds == "") {
        this.$modal.msgError("请选择要分配的用户")
        return
      }
      authRecordToUser({ recordId: recordId, userIds: userIds }).then(res => {
        this.$modal.msgSuccess(res.msg)
        this.visible = false
        this.$emit("ok")
      authRecordToUser({ recordId: archiveRecordsId, userIds: userIds }).then(res => {
        if(res.code === 200) {
      this.$modal.msgSuccess(res.msg)
      this.visible = false
      this.$emit("ok")
    } else {
      this.$modal.msgError(res.msg || "授权失败,已经授权过了")
    }
      })
    }
  }