소스 검색

修改BUG

zhangh 3 년 전
부모
커밋
26790984ad

+ 1 - 1
src/main.js

@@ -15,7 +15,7 @@ import {
     iconfontUrl,
     iconfontVersion
 } from '@/config/env';
-
+import '@/util/xiaoyu'
 import i18n from './lang'; // Internationalization
 import './styles/common.scss';
 import basicBlock from './components/basic-block/main';

+ 15 - 0
src/util/xiaoyu.js

@@ -0,0 +1,15 @@
+import Vue from 'vue'
+
+// 节流指令
+Vue.directive('throttle', {
+    inserted(el, delay) {
+        el.addEventListener('click', () => {
+            // 禁用这个指令的DOM结构点击事件
+            el.style.pointerEvents = 'none';
+            setTimeout(() => {
+                // 启动这个指令的DOM结构点击事件
+                el.style.pointerEvents = 'auto';
+            }, delay.value || 1000); // 默认1秒
+        });
+    }
+});

+ 17 - 4
src/views/certificate/lists/addList.vue

@@ -83,7 +83,7 @@
           class="upload-demo"
           action="#"
           multiple
-          :limit="1"
+          :limit="2"
           :auto-upload="false"
           accept='.pfx'
           :file-list="form.certificateFileUrl"
@@ -129,7 +129,7 @@
           class="upload-demo"
           action="#"
           multiple
-          :limit="1"
+          :limit="2"
           :auto-upload="false"
           accept='.jpg,.png'
           :file-list="form.signatureFileUrl"
@@ -206,6 +206,11 @@
             >
             </el-option>
           </el-select>
+          <i
+            class="el-icon-error marleft10"
+            @click="deleteSignPfxDeputie(key)"
+            style="fontSize:20px;color:#F0630A;cursor: pointer;"
+          ></i>
         </div>
         <!-- signPfxDeputieList -->
       </el-form-item>
@@ -215,6 +220,7 @@
       <el-button
         class="marleft30"
         type="primary"
+        v-throttle='2000'
         @click="savess()"
       >保存</el-button>
     </div>
@@ -316,6 +322,9 @@ export default {
         }
       })
     },
+    deleteSignPfxDeputie (key) {//删除关联项目
+      this.form.signPfxDeputieList.splice(key, 1)
+    },
     //#endregion
 
     //#region 上传文件得方法
@@ -402,11 +411,15 @@ export default {
         return res.data.link
       }
     },
-    async update (da) {
+    async update (da) {//编辑保存接口
       const { data: res } = await update(da)
       console.log(res);
       if (res.code == 200) {
-
+        this.$message({
+          type: 'success',
+          message: '修改电签成功!'
+        })
+        this.$router.push('/certificate/list')
       }
     },
     //#endregion

+ 7 - 1
src/views/certificate/management.vue

@@ -17,7 +17,8 @@
     </el-select>
     <el-table
       :data="tableData"
-      style="width: 100%"
+      class="tableList"
+      style="width: 100%;"
     >
       <el-table-column
         prop="projectName"
@@ -125,5 +126,10 @@ export default {
 
 <style lang="scss" scoped>
 .management {
+  .tableList {
+    /deep/ th.el-table__cell {
+      font-size: 16px !important;
+    }
+  }
 }
 </style>

+ 6 - 2
src/views/exctab/excelmodel/excelmodel.vue

@@ -416,7 +416,7 @@ export default {
       }
     },
     async getWbsTypeList () {//清表编辑 wbs 下拉框选择
-      const { data: res } = await getWbsTypeList()
+      const { data: res } = await getWbsTypeList({ wbstype: 2 })
       console.log(res);
       if (res.code === 200) {
         this.wbsmodel = res.data
@@ -629,7 +629,11 @@ export default {
       if (val) {
         this.wbsmodel.forEach((da) => {
           if (da.id == val) {
-            this.excelForm.wbsType = da.wbsType
+            this.loading = true
+            window.setTimeout(() => {
+              this.excelForm.wbsType = da.wbsType
+            }, 2000)
+            this.loading = false
           }
         })
       }

+ 13 - 13
src/views/manager/projectinfo/tree.vue

@@ -285,7 +285,8 @@
               <template slot-scope="scope">
                 <el-link
                   type="primary"
-                  @click="rightClick(scope.row.pkeyId,scope.row.excelId,scope.row.id,scope.row.initTableName,)"
+                  :disabled='scope.row.isLinkTable==-1'
+                  @click="rightClick(scope.row.pkeyId,scope.row.excelId,scope.row.id,scope.row.initTableName)"
                 >编辑元素</el-link>
                 <el-link
                   class="mg-l-10"
@@ -1369,6 +1370,9 @@ export default {
         id: "",
         name: '',
         search: '',//搜素框舒服的值
+        ids: '',
+        excelId: '',
+        initTableName: '',
       },
       GLExcelData: [],//
       GLExcelProps: {
@@ -1407,7 +1411,7 @@ export default {
       editType: 1,
 
       dialogVisible: false,
-      saveNodeLoading:false,
+      saveNodeLoading: false,
       deptCategorylist: [],
       majorDataTypeList: [],
       rules: {
@@ -1541,7 +1545,7 @@ export default {
           type: "success",
           message: "新增成功!"
         });
-        this.$nextTick(()=>{
+        this.$nextTick(() => {
           this.saveNodeLoading = false;
         })
       })
@@ -2117,6 +2121,9 @@ export default {
         this.$refs.tree.setCheckedKeys([scope.row.excelId])
       }, 2000)
       this.GLExcelFrom.id = scope.row.pkeyId
+      this.GLExcelFrom.excelId = scope.row.excelId
+      this.GLExcelFrom.ids = scope.row.id
+      this.GLExcelFrom.initTableName = scope.row.initTableName
     },
     changetherr () {//清表类型选择框change事件
       if (this.GLExcelFrom.name != "") {
@@ -2152,14 +2159,7 @@ export default {
             message: '关联清表成功',
           })
           this.GLExcel = false
-          this.GLExcelMD()
-          selectByNodeTable(this.jiedianId, this.projectid, this.id).then((res) => {
-            if (res.data.data.length) {
-              this.formData = res.data.data;
-            } else {
-              this.formData = [];
-            }
-          })
+          this.rightClick(this.GLExcelFrom.id, this.GLExcelFrom.excelId, this.GLExcelFrom.ids, this.GLExcelFrom.initTableName,)
         }
       } else {
         this.$message({
@@ -2429,8 +2429,8 @@ export default {
     padding: 10px 20px !important;
   }
 }
-.filter-tree{
+.filter-tree {
   min-width: 100%;
-  display:inline-block;
+  display: inline-block;
 }
 </style>

+ 1 - 1
src/views/news/news.vue

@@ -27,7 +27,7 @@
           @click="openPreview(scope.row.imageUrl,scope.$index)"
         >图片</el-button>
       </template>
-      <!-- 操作 -->
+      <!-- 提交进度 -->
       <template
         slot="cz"
         slot-scope="scope"

+ 3 - 2
src/views/system/user.vue

@@ -894,14 +894,15 @@ export default {
   methods: {
     //#region 弹框事件及方法
     addKJ () {
-      this.getProjectList()
-      this.treeUser()
+      this.getProjectList()//项目类型
+      this.treeUser() //获取用户类型枚举
       this.fromss.projectAndUserList = []
       this.fromss.projectId = ''
       this.fromss.userId = ''
       this.fromss.contractId = ''
       this.fromss.roleIds = ''  //合同段Id
       this.contractData = []       //合同段枚举
+      this.form.deptName = this.addData.deptId
       this.$refs.crud.rowAdd()
     },
     addProject (type) {//确定添加参建项目