Merge branch 'test' of http://106.55.241.82:3000/lzf/zhbsq-vue-web into test

src/views/norm/feeindex.vue

@@ -272,7 +272,7 @@
       </el-dialog>
     </div>
 
-    <formula @closeFormulaHandler="closeFormulaHandler" @dataFormulaHandler="dataFormulaHandler" :id="id" :normId="normId" reset :isShowFormulaDialog="isShowFormulaDialog" />
+    <formula @closeFormulaHandler="closeFormulaHandler" ref="formula" @dataFormulaHandler="dataFormulaHandler"  :id="id" :normId="normId" reset :isShowFormulaDialog="isShowFormulaDialog" />
 
   </el-dialog>
 </template>
@@ -422,6 +422,9 @@ export default {
     formulaDialog(id,formula) {
       this.isShowFormulaDialog = true;
       this.id = id;
+      // formula使用props传值有延迟，使用ref传入
+      this.$refs.formula.init(formula)
+      
     },
     dataFormulaHandler(data) {
       this.isShowFormulaDialog = false;

src/views/norm/formula.vue

@@ -112,7 +112,7 @@
 
     <div slot="footer" class="dialog-footer">
       <el-button type="primary" @click="submit">确 定</el-button>
-      <el-button @click="cancel">取 消</el-button>
+      <el-button @click="closeFormulaHandler">取 消</el-button>
     </div>
   </el-dialog>
 </template>
@@ -178,6 +178,7 @@
         default: () => {
           return null;
         },
+
       },
     },
     mounted() {
@@ -187,8 +188,15 @@
         });
         this.NORMFEEList = response.rows;
       });
+      
     },
     methods: {
+      // formula使用props传值有延迟，使用ref传入
+      init(formula) {
+        if(formula) {
+          this.number_input = formula
+        }
+      },
       close () {
         this.addMetadataSelect = [];
         this.no_show_number_input = '';
@@ -197,9 +205,6 @@
       closeFormulaHandler() {
         this.$emit("closeFormulaHandler");
       },
-      cancel() {
-        this.isShowFormulaDialog = false;
-      },
       // 回删功能
       number_input_delete() {
         this.number_input = this.number_input.replace(/.$/, '')

src/views/system/dept/index.vue

@@ -50,7 +50,7 @@
 
     <el-table
       v-if="refreshTable"
-      
+
       :data="deptList"
       row-key="deptId"
       :default-expand-all="isExpandAll"
@@ -148,6 +148,16 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-form-item label="部门类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -168,6 +178,21 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      options: [{
+        value: '1',
+        label: '一级单位(湾办)'
+      }, {
+        value: '2',
+        label: '二级单位(保税区)'
+      }, {
+        value: '3',
+        label: '三级单位(企业)'
+      }, {
+        value: '4',
+        label: '市级单位(地级市)'
+      }
+      ],
+      value: '',
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -202,6 +227,9 @@ export default {
         orderNum: [
           { required: true, message: "显示排序不能为空", trigger: "blur" }
         ],
+        type: [
+          { required: true, message: "部门类型不能为空", trigger: "blur" }
+        ],
         email: [
           {
             type: "email",