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

shuishen

2021-12-04 5510688e2cbe4844876161c8819c572af863c9dd

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

 src/views/securityCompany/confess.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-07 17:30:05
 * @Last Modified by: liu
 * @Last Modified time: 2021-09-15 11:32:53
 * @Last Modified time: 2021-12-04 17:12:02
 * menu-name 保安服务公司查询
 */
<template>
@@ -45,11 +45,18 @@
          >台账查询
        </el-button>
        <el-button
          icon="el-icon-s-custom"
          :size="size"
          :type="type"
          @click.stop="handleRowlood(row)"
          >附件预览
        </el-button>
        <el-button
          :size="size"
          :type="type"
          icon="el-icon-warning"
          class="zhengJian-icon"
          @click.stop="punish(row)"
          @click.stop="punishtable(row)"
          >处罚</el-button
        >
      </template>
@@ -86,6 +93,19 @@
        >
      </span> -->
    </el-dialog>
    <el-dialog
      title="处罚详情"
      :visible.sync="dialogVisiblepunishtable"
      width="85%"
      height="80vh"
      :before-close="handleClose"
      :modal-append-to-body="false"
      center
    >
      1231
      <punish :form="dialogVisiblepunishData" v-if="dialogVisiblepunishtable">
      </punish>
    </el-dialog>
  </basic-container>
</template>

@@ -100,10 +120,16 @@
} from "@/api/securityCompany/security";
import { mapGetters } from "vuex";
import { companyColimn, punishColimn } from "./column";
import punish from "./computents/punish.vue"; //处罚信息

export default {
  components: {
    punish,
  },
  data() {
    return {
      dialogVisiblepunishData: {},
      dialogVisiblepunishtable: false,
      objf: {},
      optionf: {
        column: punishColimn,
@@ -214,6 +240,7 @@
          type: "success",
          message: "操作成功!",
        });
        this.dialogVisiblepunishData.news = !this.dialogVisiblepunishData.news;
        that.objf = {
          enterprisename: "",
          punishreason: "",
@@ -241,15 +268,37 @@
      };
      done();
    },
    punish(row) {
    punishtable(row) {
      this.dialogVisiblepunishData = {
        ...row,
        see: true,
        that: this,
        news: false,
      };
      this.dialogVisiblepunishtable = true;
    },
    punish() {
      //打开处罚
      // console.log(row);
      this.objf = {
        deptid: row.departmentid,
        enterprisename: row.enterprisename,
        deptid: this.dialogVisiblepunishData.departmentid,
        enterprisename: this.dialogVisiblepunishData.enterprisename,
      };
      this.dialogVisible = true;
    },
    handleRowlood(row) {
      //附件预览1
      // console.log(row);
      this.$router.push({
        // path: "/attach/index",
        path: "/resource/attachCopy",
        // redirect: { name: "foo" },
        // query: { row: row },
        query: { deptid: row.departmentid, type: "4" },
        // query: { deptid: row.departmentid },
        // params: { row: row.identificationnumber },
      });
    },
    rowSave(row, done, loading) {
      add(row).then(
        () => {

 src/views/securityCompany/security.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-07 17:30:05
 * @Last Modified by: liu
 * @Last Modified time: 2021-12-04 14:40:34
 * @Last Modified time: 2021-12-04 17:04:35
 * menu-name 保安服务公司查询
 */
<template>
@@ -292,6 +292,19 @@
      };
      this.dialogVisible = true;
    },
    handleRowlood(row) {
      //附件预览1
      // console.log(row);
      this.$router.push({
        // path: "/attach/index",
        path: "/resource/attachCopy",
        // redirect: { name: "foo" },
        // query: { row: row },
        query: { deptid: row.departmentid, type: "4" },
        // query: { deptid: row.departmentid },
        // params: { row: row.identificationnumber },
      });
    },
    rowSave(row, done, loading) {
      add(row).then(
        () => {
@@ -402,19 +415,6 @@
      this.$router.push({
        path: `/securityCompany/index`,
        query: obj,
      });
    },
    handleRowlood(row) {
      //附件预览1
      // console.log(row);
      this.$router.push({
        // path: "/attach/index",
        path: "/resource/attachCopy",
        // redirect: { name: "foo" },
        // query: { row: row },
        query: { deptid: row.departmentid, type: "4" },
        // query: { deptid: row.departmentid },
        // params: { row: row.identificationnumber },
      });
    },
  },

 src/views/securityCompany/securityCrossRegion.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-07 17:30:05
 * @Last Modified by: liu
 * @Last Modified time: 2021-09-15 11:31:06
 * @Last Modified time: 2021-12-04 17:02:33
 * menu-name 保安服务公司查询
 */
<template>
@@ -45,11 +45,18 @@
          >台账查询
        </el-button>
        <el-button
          icon="el-icon-s-custom"
          :size="size"
          :type="type"
          @click.stop="handleRowlood(row)"
          >附件预览
        </el-button>
        <el-button
          :size="size"
          :type="type"
          icon="el-icon-warning"
          class="zhengJian-icon"
          @click.stop="punish(row)"
          @click.stop="punishtable(row)"
          >处罚</el-button
        >
      </template>
@@ -86,6 +93,18 @@
        >
      </span> -->
    </el-dialog>
    <el-dialog
      title="处罚详情"
      :visible.sync="dialogVisiblepunishtable"
      width="85%"
      height="80vh"
      :before-close="handleClose"
      :modal-append-to-body="false"
      center
    >
      <punish :form="dialogVisiblepunishData" v-if="dialogVisiblepunishtable">
      </punish>
    </el-dialog>
  </basic-container>
</template>

@@ -100,10 +119,16 @@
} from "@/api/securityCompany/security";
import { mapGetters } from "vuex";
import { companyColimn, punishColimn } from "./column";
import punish from "./computents/punish.vue"; //处罚信息

export default {
  components: {
    punish,
  },
  data() {
    return {
      dialogVisiblepunishData: {},
      dialogVisiblepunishtable: false,
      objf: {},
      optionf: {
        column: punishColimn,
@@ -214,6 +239,7 @@
          type: "success",
          message: "操作成功!",
        });
        this.dialogVisiblepunishData.news = !this.dialogVisiblepunishData.news;
        that.objf = {
          enterprisename: "",
          punishreason: "",
@@ -241,12 +267,21 @@
      };
      done();
    },
    punish(row) {
    punishtable(row) {
      this.dialogVisiblepunishData = {
        ...row,
        see: true,
        that: this,
        news: false,
      };
      this.dialogVisiblepunishtable = true;
    },
    punish() {
      //打开处罚
      // console.log(row);
      this.objf = {
        deptid: row.departmentid,
        enterprisename: row.enterprisename,
        deptid: this.dialogVisiblepunishData.departmentid,
        enterprisename: this.dialogVisiblepunishData.enterprisename,
      };
      this.dialogVisible = true;
    },
@@ -361,6 +396,19 @@
        query: obj,
      });
    },
    handleRowlood(row) {
      //附件预览1
      // console.log(row);
      this.$router.push({
        // path: "/attach/index",
        path: "/resource/attachCopy",
        // redirect: { name: "foo" },
        // query: { row: row },
        query: { deptid: row.departmentid, type: "4" },
        // query: { deptid: row.departmentid },
        // params: { row: row.identificationnumber },
      });
    },
  },
};
</script>

 src/views/securityCompany/train.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-07 17:30:05
 * @Last Modified by: liu
 * @Last Modified time: 2021-09-15 11:32:51
 * @Last Modified time: 2021-12-04 17:08:36
 * menu-name 保安服务公司查询
 */
<template>
@@ -45,11 +45,18 @@
          >台账查询
        </el-button>
        <el-button
          icon="el-icon-s-custom"
          :size="size"
          :type="type"
          @click.stop="handleRowlood(row)"
          >附件预览
        </el-button>
        <el-button
          :size="size"
          :type="type"
          icon="el-icon-warning"
          class="zhengJian-icon"
          @click.stop="punish(row)"
          @click.stop="punishtable(row)"
          >处罚</el-button
        >
      </template>
@@ -86,6 +93,18 @@
        >
      </span> -->
    </el-dialog>
    <el-dialog
      title="处罚详情"
      :visible.sync="dialogVisiblepunishtable"
      width="85%"
      height="80vh"
      :before-close="handleClose"
      :modal-append-to-body="false"
      center
    >
      <punish :form="dialogVisiblepunishData" v-if="dialogVisiblepunishtable">
      </punish>
    </el-dialog>
  </basic-container>
</template>

@@ -100,10 +119,16 @@
} from "@/api/securityCompany/security";
import { mapGetters } from "vuex";
import { companyColimn, punishColimn } from "./column";
import punish from "./computents/punish.vue"; //处罚信息

export default {
  components: {
    punish,
  },
  data() {
    return {
      dialogVisiblepunishData: {},
      dialogVisiblepunishtable: false,
      objf: {},
      optionf: {
        column: punishColimn,
@@ -214,6 +239,7 @@
          type: "success",
          message: "操作成功!",
        });
        this.dialogVisiblepunishData.news = !this.dialogVisiblepunishData.news;
        that.objf = {
          enterprisename: "",
          punishreason: "",
@@ -349,7 +375,37 @@
        this.selectionClear();
      });
    },

    punishtable(row) {
      this.dialogVisiblepunishData = {
        ...row,
        see: true,
        that: this,
        news: false,
      };
      this.dialogVisiblepunishtable = true;
    },
    punish() {
      //打开处罚
      // console.log(row);
      this.objf = {
        deptid: this.dialogVisiblepunishData.departmentid,
        enterprisename: this.dialogVisiblepunishData.enterprisename,
      };
      this.dialogVisible = true;
    },
    handleRowlood(row) {
      //附件预览1
      // console.log(row);
      this.$router.push({
        // path: "/attach/index",
        path: "/resource/attachCopy",
        // redirect: { name: "foo" },
        // query: { row: row },
        query: { deptid: row.departmentid, type: "4" },
        // query: { deptid: row.departmentid },
        // params: { row: row.identificationnumber },
      });
    },
    // 行单击
    handleRowClick(row) {
      // delete (row["name"]);