Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory_ys

Administrator

2021-09-15 6150cb98194814c285e8f72d7e8c11bbd8b9a121

 src/views/securityCompany/securityCrossRegion.vue

@@ -1,8 +1,8 @@
/*
 * @Author: Morpheus
 * @Date: 2021-07-07 17:30:05
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-07-10 16:01:42
 * @Last Modified by: liu
 * @Last Modified time: 2021-09-15 11:31:06
 * menu-name 保安服务公司查询
 */
<template>
@@ -42,7 +42,7 @@
          :size="size"
          :type="type"
          @click.stop="handleRowClick(row)"
          >查看
          >台账查询
        </el-button>
        <el-button
          :size="size"
@@ -99,71 +99,14 @@
  savePunish,
} from "@/api/securityCompany/security";
import { mapGetters } from "vuex";
import { companyColimn } from "./column";
import { companyColimn, punishColimn } from "./column";

export default {
  data() {
    return {
      objf: {},
      optionf: {
        column: [
          {
            label: "公司名称",
            prop: "enterprisename",
            span: 24,
            labelWidth: 110,
            rules: [
              {
                required: true,
                message: "请输入身份证号码",
                trigger: "blur",
              },
            ],
          },
          {
            label: "处罚原因",
            prop: "punishreason",
            span: 24,
            labelWidth: 110,
            rules: [
              {
                required: true,
                message: "请输入荣誉名称",
                trigger: "blur",
              },
            ],
          },
          {
            label: "处罚结果",
            prop: "punishresult",
            span: 24,
            // type: "textarea",
            labelWidth: 110,
          },
          {
            label: "处罚日期",
            prop: "punishtime",
            span: 24,
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            // type: "textarea",
            labelWidth: 110,
          },
          {
            label: "处罚批准文号",
            prop: "punisnum",
            span: 24,
            // type: "textarea",
            labelWidth: 110,
          },
          //   {
          //     label: "授予单位名称",
          //     prop: "sex2",
          //     span: 24,
          //     labelWidth: 110,
          //   },
        ],
        column: punishColimn,
      },
      dialogVisible: false,

@@ -190,7 +133,7 @@
        calcHeight: 30,
        tip: false,
        searchShow: true,
        menuWidth: 160,
        menuWidth: 280,
        searchMenuSpan: 6,
        index: true,
        viewBtn: true,
@@ -411,7 +354,7 @@
    handleRowClick(row) {
      // delete (row["name"]);
      var obj = row;
      obj["name"] = "保安公司详细信息";
      obj["name"] = "保安公司台账信息";
      console.log(obj, "obj");
      this.$router.push({
        path: `/securityCompany/index`,