Merge remote-tracking branch 'origin/master'

src/api/stamp/sealList.js

@@ -1,5 +1,20 @@
 import request from '@/utils/request'
 
+// 开启
+export function open(id) {
+  return request({
+    url: '/bpm/oa-stamp-seal/open?id=' + id,
+    method: 'put',
+  })
+}
+// 关闭
+export function close(id) {
+  return request({
+    url: '/bpm/oa-stamp-seal/close?id=' + id,
+    method: 'put',
+  })
+}
+
 // 查询印章列表
 export function listSeal(query) {
   return request({

src/mayout/index.vue

@@ -150,6 +150,8 @@ export default {
     joinOrCreateCorp(val) {
       this.corpTitle = val;
       this.joinOrCreateVisible = true;
+      this.form.name = '';
+      this.form.tenantId = '';
     },
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {

src/views/index.vue

@@ -320,6 +320,8 @@ export default {
     joinOrCreateCorp(val) {
       this.corpTitle = val;
       this.joinOrCreateVisible = true;
+      this.form.name = '';
+      this.form.tenantId = '';
     },
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {

src/views/meeting/list/index.vue

@@ -113,7 +113,7 @@
             { required: true, message: "容纳人数不能为空", trigger: "blur" }
           ],
           managerName: [
-            { required: true, message: "管理员不能为空", trigger: "blur" }
+            { required: true, message: "管理员不能为空",}
           ]
         },
   

src/views/oa/purchase/edit.vue

@@ -32,7 +32,7 @@
           <template slot-scope="scope">
             <el-form-item  :prop="'oaPurchaseObjs.' + scope.$index + '.amount'"
               :rules="{ required: true, message: '采购数量不能为空', trigger: 'blur' }">
-              <el-input v-model="form.oaPurchaseObjs[scope.$index].amount" autocomplete="off" size="small" type='number'
+              <el-input v-model="form.oaPurchaseObjs[scope.$index].amount" :min='1' size="small" type='number'
                 placeholder="采购数量"></el-input>
             </el-form-item>
           </template>

src/views/oa/receive/edit.vue

@@ -37,7 +37,7 @@
           <template slot-scope="scope">
             <el-form-item  :prop="'oaReceiveObjs.' + scope.$index + '.amount'"
               :rules="{ required: true, message: '领用数量不能为空', trigger: 'blur' }">
-              <el-input v-model="form.oaReceiveObjs[scope.$index].amount" autocomplete="off" size="small" type='number'
+              <el-input v-model="form.oaReceiveObjs[scope.$index].amount" :min='1' size="small" type='number'
                 placeholder="领用数量"></el-input>
             </el-form-item>
           </template>

src/views/personnel/relations/contract/index.vue

@@ -132,7 +132,7 @@
 
           <el-col :span="12">
             <el-form-item label="合同期限" prop="contractDeadline">
-              <el-input v-model="form.contractDeadline" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder='续签合同期限(月)'></el-input>
+              <el-input v-model="form.contractDeadline" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder='合同期限(月)'></el-input>
             </el-form-item>
           </el-col>
          

src/views/stamp/list/index.vue

@@ -99,11 +99,11 @@
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-      <el-form-item label="离职人" prop="employeeName">
+      <el-form-item label="用印人" prop="employeeName">
         <el-input v-model="form.employeeName" placeholder='点击选择' readonly @click.native="openSingle"></el-input>
       </el-form-item>
-      <el-form-item label="离职人Id" style="display: none;">
-        <el-input v-model="form.employeeId" placeholder='离职人Id' disabled></el-input>
+      <el-form-item label="用印人Id" style="display: none;">
+        <el-input v-model="form.employeeId" placeholder='用印人Id' disabled></el-input>
       </el-form-item>
       <el-form-item label="部门">
         <el-input v-model="form.deptName" placeholder='部门' disabled></el-input>

src/views/stamp/sealList/index.vue

@@ -25,11 +25,19 @@
           <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
                      v-hasPermi="['stamp:seal:export']">导出</el-button>
         </el-col>
+        <el-col :span="1.5">
+                <el-button type="success" size="mini" :disabled="single" @click="handleOpen()"
+                    v-hasPermi="['stamp:seal:open']">开启</el-button>
+            </el-col>
+      <el-col :span="1.5">
+                <el-button type="info" size="mini" :disabled="single" @click="handleClose()"
+                    v-hasPermi="['stamp:seal:close']">关闭</el-button>
+            </el-col>
         <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
   
-      <el-table v-loading="loading" :data="SealList">
-        <!-- <el-table-column label="类别" align="center" prop="sealType" /> -->
+      <el-table v-loading="loading" :data="SealList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" align="center" width="55" />
         <el-table-column label="名称" align="center" prop="sealName" />
         <el-table-column label="有效期起" align="center" prop="startDate" />
         <el-table-column label="有效期止" align="center" prop="endDate" />
@@ -76,12 +84,12 @@
               style="width: 100%;">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="状态">
+          <!-- <el-form-item label="状态">
             <el-radio-group v-model="form.status">
               <el-radio label="1">打开</el-radio>
               <el-radio label="2">关闭</el-radio>
             </el-radio-group>
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="附件">
             <el-upload :action="fileUrl" :headers="headers" :file-list="files" :on-success="handleFileSuccessCite"
               :before-upload="beforeUploadFile" :on-remove="handleRemove">
@@ -101,14 +109,16 @@
   </template>
   
   <script>
-  import { listSeal, getSeal, delSeal, addSeal, updateSeal, exportSeal } from "@/api/stamp/sealList";
+  import { open,close,listSeal, getSeal, delSeal, addSeal, updateSeal, exportSeal } from "@/api/stamp/sealList";
   import { getBaseHeader } from "@/utils/request";
-  import { getDictDatas, DICT_TYPE } from '@/utils/dict'
   
   export default {
     name: "StampSeal",
     data() {
       return {
+        dataInfo:undefined,
+      // 非单个禁用
+      single: true,
         files: [],
          // 设置上传的请求头部
       headers: getBaseHeader(),
@@ -152,6 +162,24 @@
       this.getList();
     },
     methods: {
+      handleSelectionChange(selection) {
+            console.log(selection);
+            this.dataInfo = selection.map(item => item)
+            console.log(this.dataInfo);
+            this.single = selection.length != 1
+        },
+      handleOpen(){
+        open(this.dataInfo[0].id).then(response => {
+            this.$modal.msgSuccess("开启成功");
+            this.getList();
+          });
+      },
+      handleClose(){
+        close(this.dataInfo[0].id).then(response => {
+            this.$modal.msgSuccess("关闭成功");
+            this.getList();
+          });
+      },
       handleRemove(file, fileList) {
       console.log(file, fileList);
       let fileIds = [];

src/views/system/dept/index.vue

@@ -47,8 +47,10 @@
                      v-hasPermi="['system:dept:update']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
                      v-hasPermi="['system:dept:create']">新增</el-button>
-          <el-button v-if="scope.row.parentId !== 0" size="mini" type="text" icon="el-icon-delete"
+          <el-button size="mini" type="text" icon="el-icon-delete"
                      @click="handleDelete(scope.row)" v-hasPermi="['system:dept:delete']">删除</el-button>
+          <!-- <el-button v-if="scope.row.parentId !== 0" size="mini" type="text" icon="el-icon-delete"
+                     @click="handleDelete(scope.row)" v-hasPermi="['system:dept:delete']">删除</el-button> -->
         </template>
       </el-table-column>
     </el-table>