sunlupeng 1 年之前
父节点
当前提交
73a1726606
共有 3 个文件被更改,包括 13 次插入19 次删除
  1. 2 2
      .env.dev
  2. 1 1
      src/views/oa/stamp/detail.vue
  3. 10 16
      src/views/stamp/sealList/index.vue

+ 2 - 2
.env.dev

@@ -6,9 +6,9 @@ VUE_APP_TITLE = 爱思系统
 
 # 爱思系统/开发环境
 # 赵培清
-VUE_APP_BASE_API = 'http://192.168.100.213:48080'
+# VUE_APP_BASE_API = 'http://192.168.100.213:48080'
 # 王东坡
-# VUE_APP_BASE_API = 'http://192.168.100.64:48081'
+VUE_APP_BASE_API = 'http://192.168.100.64:48081'
 # 测试
 # VUE_APP_BASE_API = 'http://47.103.79.143:48081'
 

+ 1 - 1
src/views/oa/stamp/detail.vue

@@ -143,7 +143,7 @@
 </template>
 
 <script>
-import { getDetail,agree,disagree,revocation } from "@/api/oa/stamp"
+import { typeList,getDetail,agree,disagree,revocation } from "@/api/oa/stamp"
 import {getDate} from "@/utils/dateUtils";
 export default {
   props: {

+ 10 - 16
src/views/stamp/sealList/index.vue

@@ -6,7 +6,7 @@
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select v-model="queryParams.status" placeholder="印章状态" clearable>
-            <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+            <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -18,17 +18,17 @@
       <el-row :gutter="10" class="mb8">
         <el-col :span="1.5">
           <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                     v-hasPermi="['stamp:Seal:create']">新增</el-button>
+                     v-hasPermi="['stamp:seal:create']">新增</el-button>
         </el-col>
         <el-col :span="1.5">
           <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                     v-hasPermi="['stamp:Seal:export']">导出</el-button>
+                     v-hasPermi="['stamp:seal:export']">导出</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-column label="类别" align="center" prop="sealType" /> -->
         <el-table-column label="名称" align="center" prop="sealName" />
         <el-table-column label="有效期起" align="center" prop="startDate" />
         <el-table-column label="有效期止" align="center" prop="endDate" />
@@ -45,9 +45,9 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template v-slot="scope">
             <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                       v-hasPermi="['stamp:Seal:update']">修改</el-button>
+                       v-hasPermi="['stamp:seal:update']">修改</el-button>
             <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                       v-hasPermi="['stamp:Seal:delete']">删除</el-button>
+                       v-hasPermi="['stamp:seal:delete']">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -58,9 +58,9 @@
       <!-- 添加或修改印章对话框 -->
       <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-form-item label="类别" prop="sealType">
+          <!-- <el-form-item label="类别" prop="sealType">
             <el-input v-model="form.sealType" placeholder="请输入类别" />
-          </el-form-item>
+          </el-form-item> -->
           <el-form-item label="名称" prop="sealName">
             <el-input v-model="form.sealName" placeholder="请输入名称" />
           </el-form-item>
@@ -76,7 +76,7 @@
           </el-form-item>
           <el-form-item label="状态">
             <el-radio-group v-model="form.status">
-              <el-radio v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="parseInt(dict.value)">
+              <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="dict.value" :label="dict.value">
                 {{dict.label}}</el-radio>
             </el-radio-group>
           </el-form-item>
@@ -101,7 +101,6 @@
   <script>
   import { listSeal, getSeal, delSeal, addSeal, updateSeal, exportSeal } from "@/api/stamp/sealList";
   import { getBaseHeader } from "@/utils/request";
-  import {CommonStatusEnum} from '@/utils/constants'
   import { getDictDatas, DICT_TYPE } from '@/utils/dict'
   
   export default {
@@ -145,11 +144,6 @@
             { required: true, message: "名称不能为空", trigger: "blur" }
           ],
         },
-  
-        // 枚举
-        CommonStatusEnum: CommonStatusEnum,
-        // 数据字典
-        statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS)
       };
     },
     created() {
@@ -215,7 +209,7 @@
           startDate: undefined,
           endDate: undefined,
           fileIdList: undefined,
-          status: CommonStatusEnum.ENABLE,
+          status: '0',
           remarks: undefined
         };
         this.resetForm("form");