Merge remote-tracking branch 'origin/master'

src/views/CONTACTUS/index.vue

@@ -47,6 +47,11 @@
           {{ scope.row.location }}
         </template>
       </el-table-column>
+      <el-table-column label="单位编码" align="center" prop="pcode">
+        <template slot-scope="scope">
+          {{ scope.row.pcode }}
+        </template>
+      </el-table-column>
       <el-table-column label="邮箱" align="center" prop="email">
         <template slot-scope="scope">
           {{ scope.row.email }}
@@ -84,6 +89,9 @@
         <el-form-item label="邮箱" prop="email">
           <el-input v-model="form.email" placeholder="请输入邮箱"></el-input>
         </el-form-item>
+        <el-form-item label="单位编码" prop="pcode">
+          <el-input v-model="form.pcode" placeholder="请输入单位编码" type="number"></el-input>
+        </el-form-item>
         <el-form-item label="位置" prop="location">
           <el-input v-model="form.location" placeholder="请输入位置" rows="5" type="textarea"></el-input>
         </el-form-item>
@@ -149,6 +157,7 @@ export default {
         delFlag: [{ required: true, message: '删除标志不能为空', trigger: 'blur' }],
         deptId: [{ required: true, message: '部门ID不能为空', trigger: 'blur' }],
         depName: [{ required: true, message: '单位名称不能为空', trigger: 'blur' }],
+        pcode: [{ required: true, message: '单位编码不能为空', trigger: 'blur' }],
         telphone: [{ required: true, message: '联系电话不能为空', trigger: 'blur' },
                 { validator: this.validateMobile, trigger: 'blur' }],
         location: [{ required: true, message: '位置不能为空', trigger: 'blur' }],
@@ -181,7 +190,7 @@ export default {
           callback(new Error('请输入正确手机号！'));
         }
       }
-      
+
     },
     /** 查询联系我们列表 */
     getList() {
@@ -204,6 +213,7 @@ export default {
         delFlag: null,
         deptId: null,
         depName: null,
+        pcode: null,
         telphone: null,
         location: null,
         email: null

src/views/norm/feeindex.vue

@@ -541,16 +541,20 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal
-        .confirm('是否确认删除指标权重明细编号为"' + ids + '"的数据项？')
-        .then(function () {
-          return delNORMFEE(ids);
-        })
-        .then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        })
-        .catch(() => {});
+      getNORMFEE(ids)
+        .then((response) => {
+          this.fname = response.data.fname;
+          this.$modal
+            .confirm('是否确认删除指标参数名称为"' + this.fname + '"的数据项？')
+            .then(() => {
+              return delNORMFEE(ids);
+            })
+            .then(() => {
+              this.getList();
+              this.$modal.msgSuccess("删除成功");
+            })
+            .catch(() => {});
+        });
     },
     /** 导出按钮操作 */
     handleExport() {

src/views/system/role/index.vue

@@ -128,6 +128,7 @@
             v-hasPermi="['system:role:edit']"
           >修改</el-button>
           <el-button
+            v-if="![8, 9, 10].includes(scope.row.roleId)"
             size="mini"
             type="text"
             icon="el-icon-delete"
@@ -604,4 +605,4 @@ export default {
     }
   }
 };
-</script>
+</script>