From 9b9b54b6d3773c46b9c3e1a1a8faa602a99aa3e7 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Wed, 27 Nov 2019 09:32:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=83=E5=85=AC=E5=BC=8F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9=E3=80=81=E6=9C=BA=E6=9E=84?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/kpi/kpiformula-add-or-update.vue | 7 +++++++
 src/views/modules/kpi/kpiformula.vue               | 1 +
 src/views/modules/sys/dept-add-or-update.vue       | 8 ++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/kpi/kpiformula-add-or-update.vue b/src/views/modules/kpi/kpiformula-add-or-update.vue
index 37e82c41..53b7c8f9 100644
--- a/src/views/modules/kpi/kpiformula-add-or-update.vue
+++ b/src/views/modules/kpi/kpiformula-add-or-update.vue
@@ -6,6 +6,9 @@
       </el-form-item>
       <el-form-item label="公式编码" prop="code">
           <el-input v-model="dataForm.code" placeholder="公式编码"></el-input>
+      </el-form-item>
+      <el-form-item label="方法名" prop="functionName">
+          <el-input v-model="dataForm.functionName" placeholder="方法名"></el-input>
       </el-form-item>
           <el-form-item label="公式运行方法" prop="formula">
           <el-input v-model="dataForm.formula" placeholder="公式运行方法（Javascript）" type="textarea"></el-input>
@@ -55,6 +58,7 @@ export default {
         id: '',
         code: '',
         name: '',
+        functionName: '',
         formula: '',
         paramAmount: '',
         description: '',
@@ -77,6 +81,9 @@ export default {
         name: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        functionName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
         formula: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
diff --git a/src/views/modules/kpi/kpiformula.vue b/src/views/modules/kpi/kpiformula.vue
index aa58de1e..2b439586 100644
--- a/src/views/modules/kpi/kpiformula.vue
+++ b/src/views/modules/kpi/kpiformula.vue
@@ -21,6 +21,7 @@
         <el-table-column prop="id" label="主键" header-align="center" align="center" v-if="false"></el-table-column>
         <el-table-column prop="code" label="公式编码" header-align="center" align="center" v-if="false"></el-table-column>
         <el-table-column prop="name" label="公式名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="functionName" label="方法名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="formula" label="公式运行方法" header-align="center" align="center"></el-table-column>
         <el-table-column prop="paramAmount" label="公式参数数量" header-align="center" align="center" ></el-table-column>
         <el-table-column prop="description" label="公式描述" header-align="center" align="center"></el-table-column>
diff --git a/src/views/modules/sys/dept-add-or-update.vue b/src/views/modules/sys/dept-add-or-update.vue
index 9bb782bb..79fb3497 100644
--- a/src/views/modules/sys/dept-add-or-update.vue
+++ b/src/views/modules/sys/dept-add-or-update.vue
@@ -13,7 +13,8 @@
         <el-input v-model="dataForm.name"
                   :placeholder="$t('dept.name')"></el-input>
       </el-form-item>
-      <el-form-item :label="$t('dept.partyCode')">
+      <el-form-item prop="partyCode"
+                    :label="$t('dept.partyCode')">
         <el-input v-model="dataForm.partyCode"
                   :placeholder="$t('dept.partyCode')"></el-input>
       </el-form-item>
@@ -49,7 +50,7 @@
                     prop="typeKey">
         <el-select v-model="dataForm.typeKey"
                    @change="changeOrgType"
-                   placeholder="街道类型">
+                   placeholder="机构类型">
           <el-option v-for="item in secondOrgDictList"
                      :key="item.dictValue"
                      :label="item.dictName"
@@ -100,6 +101,9 @@ export default {
         name: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
+        partyCode: [
+          { required: true, message: this.$t('validate.required'), trigger: 'change' }
+        ],
         parentName: [
           { required: true, message: this.$t('validate.required'), trigger: 'change' }
         ],