部分内容的修改整理

shuishen

2021-09-10 97837d1f683c4c1900a01dc86c1e08e7c90d1de3

部分内容的修改整理

 package-lock.json

Diff too large

 src/views/dispatch/dispatch.vue

@@ -3,8 +3,7 @@
    <div class="dispatch">
      <!-- <avue-tabs :option="optionTABS" @change="handleChangeTABS"></avue-tabs>
    <span v-if="typeTABS.prop === 'tab1'"> -->
      <avue-crud
        :option="option"
            <avue-crud :option="option"
        :data="data"
        :page.sync="page"
        ref="crudrec"
@@ -17,46 +16,39 @@
        @row-del="rowDel"
        @selection-change="selectionChange"
        @refresh-change="refreshChange"
        @row-click="rowClick"
      >
                       @row-click="rowClick">
        <template slot="menuLeft">
          <el-button
            type="danger"
                    <el-button type="danger"
            size="small"
            plain
            icon="el-icon-delete"
            @click="handleDelete"
            >删 除
                               @click="handleDelete">删 除
          </el-button>

          <el-button
            type="success"
                    <el-button type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport"
            >批量导入
                               @click="handleImport">批量导入
          </el-button>
        </template>

        <template slot-scope="{ row }" slot="jurisdiction">
                <template slot-scope="{ row }"
                          slot="jurisdiction">
          {{ row.jurisdiction == -1 ? "" : row.jurisdiction }}
        </template>
      </avue-crud>

      <el-dialog
        title="派遣单位导入"
            <el-dialog title="派遣单位导入"
        append-to-body
        :visible.sync="excelBox"
        width="555px"
      >
        <avue-form
          :option="excelOption"
                       width="555px">
                <avue-form :option="excelOption"
          v-model="excelForm"
          :upload-after="uploadAfter"
        >
                           :upload-after="uploadAfter">
          <template slot="excelTemplate">
            <el-button type="primary" @click="handleTemplate">
                        <el-button type="primary"
                                   @click="handleTemplate">
              点击下载<i class="el-icon-download el-icon--right"></i>
            </el-button>
          </template>
@@ -206,6 +198,9 @@
        height: 623,
        menuWidth: 160,
        align: "center",
                addTitle: "信息采集",
                addBtnText: "信息采集",
                editBtnText: "修改",
        selection: true,
        column: [
          //派遣服务公司登记
@@ -220,6 +215,20 @@
            // span: 12,
            labelWidth: 118,
          },
                    {
                        label: "派遣单位地址",
                        prop: "address",
                        search: false,
                        searchLabelWidth: 110,
                        overHidden: true,
                        searchSpan: 4,
                        width: 210,
                        // span: 12,
                        labelWidth: 118,
                    },



          {
            label: "保安公司",
            prop: "deptId",
@@ -286,6 +295,44 @@
              },
            ],
          },
                    // {
                    //   label: " 派遣人数",
                    //   prop: "num",
                    //   labelWidth: 118,
                    // },
                    {
                        label: "合同开始时间",
                        prop: "startTime",
                        labelWidth: 118,
                        type: "date",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
                        // search: true,
                        // searchSpan: 4,
                        // overHidden: true
                    },
                    {
                        label: "合同结束时间",
                        prop: "endTime",
                        labelWidth: 118,
                        type: "date",
                        format: "yyyy-MM-dd",
                        valueFormat: "yyyy-MM-dd",
                        // search: true,
                        // searchSpan: 4,
                        // overHidden: true
                    },
                    {
                        label: " 负责人",
                        prop: "linkman",
                        labelWidth: 118,
                    },
                    {
                        label: "负责人联系方式",
                        prop: "phone",
                        labelWidth: 118,
                        width: 110,
                    },
          {
            label: "所属辖区",
            prop: "jurisdiction",
@@ -336,45 +383,7 @@
                trigger: "click",
              },
            ],
          },
          // {
          //   label: " 派遣人数",
          //   prop: "num",
          //   labelWidth: 118,
          // },
          {
            label: "合同开始时间",
            prop: "startTime",
            labelWidth: 118,
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            // search: true,
            // searchSpan: 4,
            // overHidden: true
          },
          {
            label: "合同结束时间",
            prop: "endTime",
            labelWidth: 118,
            type: "date",
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            // search: true,
            // searchSpan: 4,
            // overHidden: true
          },
          {
            label: " 负责人",
            prop: "linkman",
            labelWidth: 118,
          },
          {
            label: "负责人联系方式",
            prop: "phone",
            labelWidth: 118,
            width: 110,
          },
                    }
        ],
      },
    };

 src/views/dispatch/dispatchChildoperable.vue

@@ -1,8 +1,7 @@
<template>
  <basic-container>
    <div class="dispatchChildoperable">
      <avue-crud
        :option="option1"
            <avue-crud :option="option1"
        :data="data1"
        :page.sync="page1"
        ref="crudrec1"
@@ -15,8 +14,7 @@
        @row-update="rowUpdate1"
        @row-del="rowDel1"
        @selection-change="selectionChange1"
        @refresh-change="refreshChange1"
      >
                       @refresh-change="refreshChange1">
      </avue-crud>
    </div>
  </basic-container>
@@ -60,7 +58,9 @@
        height: 623,
        cellBtn: false,
        delBtnText: "结束派遣",
        editBtnText: "变更派遣",
                editBtnText: "更改派遣",
                addTitle: "记录添加",
                addBtnText: "记录添加",
        // addBtn: false,
        // menuWidth: 160,
        align: "center",
@@ -197,7 +197,21 @@
          //     // searchSpan: 4,
          //     // overHidden: true
          // },

                    {
                        label: "派遣地址",
                        prop: "dispatcheraddress",
                        labelWidth: 120,
                        rules: [
                            {
                                required: true,
                                message: "请输入派遣地址",
                                trigger: "click",
                            },
                        ],
                        // search: true,
                        // searchSpan: 4,
                        // overHidden: true
                    },
          {
            label: "开始时间",
            prop: "dispatchertime",
@@ -258,21 +272,7 @@
              },
            ],
          },
          {
            label: "派遣地址",
            prop: "dispatcheraddress",
            labelWidth: 120,
            rules: [
              {
                required: true,
                message: "请输入派遣地址",
                trigger: "click",
              },
            ],
            // search: true,
            // searchSpan: 4,
            // overHidden: true
          },

        ],
      },
    };

 src/views/recruitmentManagement/index.vue

@@ -1,8 +1,7 @@
<template>
  <basic-container>
    <div class="recruitmentManagement">
      <avue-crud
        :option="option"
            <avue-crud :option="option"
        :data="data"
        :page.sync="page"
        ref="crudrec"
@@ -14,16 +13,13 @@
        @row-update="rowUpdate"
        @row-del="rowDel"
        @selection-change="selectionChange"
        @refresh-change="refreshChange"
      >
                       @refresh-change="refreshChange">
        <template slot="menuLeft">
          <el-button
            type="danger"
                    <el-button type="danger"
            size="small"
            plain
            icon="el-icon-delete"
            @click="handleDelete"
            >删 除
                               @click="handleDelete">删 除
          </el-button>
        </template>
      </avue-crud>
@@ -64,6 +60,9 @@
        align: "center",
        selection: true,
        column: column,
                addTitle: "信息新增",
                addBtnText: "信息新增",
                editBtnText: "修改",
      },
    };
  },

 src/views/securityEquipment/car.vue

@@ -1,8 +1,7 @@
<template>
  <basic-container>
    <div class="equipments">
      <avue-crud
        :option="option"
            <avue-crud :option="option"
        :data="data"
        :page.sync="page"
        ref="crudrec"
@@ -14,41 +13,33 @@
        @row-update="rowUpdate"
        @row-del="rowDel"
        @selection-change="selectionChange"
        @refresh-change="refreshChange"
      >
                       @refresh-change="refreshChange">
        <template slot="menuLeft">
          <el-button
            type="danger"
                    <el-button type="danger"
            size="small"
            plain
            icon="el-icon-delete"
            @click="handleDelete"
            >删 除
                               @click="handleDelete">删 除
          </el-button>
          <el-button
            style="display:none"
                    <el-button style="display:none"
            type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport"
            >批量导入
                               @click="handleImport">批量导入
          </el-button>
        </template>
      </avue-crud>
      <el-dialog
        title="车辆导入"
            <el-dialog title="车辆导入"
        append-to-body
        :visible.sync="excelBox"
        width="555px"
      >
        <avue-form
          :option="excelOption"
                       width="555px">
                <avue-form :option="excelOption"
          v-model="excelForm"
          :upload-after="uploadAfter"
        >
                           :upload-after="uploadAfter">
          <template slot="excelTemplate">
            <el-button type="primary" @click="handleTemplate">
                        <el-button type="primary"
                                   @click="handleTemplate">
              点击下载<i class="el-icon-download el-icon--right"></i>
            </el-button>
          </template>
@@ -115,6 +106,8 @@
        align: "center",
        selection: true,
        labelWidth:110,
                addTitle: "信息采集",
                addBtnText: "信息采集",
        column: column,
      },
    };

 src/views/securityEquipment/equipments.vue

@@ -1,8 +1,7 @@
<template>
  <basic-container>
    <div class="equipments">
      <avue-crud
        :option="option"
            <avue-crud :option="option"
        :data="data"
        :page.sync="page"
        ref="crudrec"
@@ -14,40 +13,32 @@
        @row-update="rowUpdate"
        @row-del="rowDel"
        @selection-change="selectionChange"
        @refresh-change="refreshChange"
      >
                       @refresh-change="refreshChange">
        <template slot="menuLeft">
          <el-button
            type="danger"
                    <el-button type="danger"
            size="small"
            plain
            icon="el-icon-delete"
            @click="handleDelete"
            >删 除
                               @click="handleDelete">删 除
          </el-button>
          <el-button
            type="success"
                    <el-button type="success"
            size="small"
            plain
            icon="el-icon-upload2"
            @click="handleImport"
            >批量导入
                               @click="handleImport">批量导入
          </el-button>
        </template>
      </avue-crud>
      <el-dialog
        title="装备附件批量导入"
            <el-dialog title="装备附件批量导入"
        append-to-body
        :visible.sync="excelBox"
        width="555px"
      >
        <avue-form
          :option="excelOption"
                       width="555px">
                <avue-form :option="excelOption"
          v-model="excelForm"
          :upload-after="uploadAfter"
        >
                           :upload-after="uploadAfter">
          <template slot="excelTemplate">
            <el-button type="primary" @click="handleTemplate">
                        <el-button type="primary"
                                   @click="handleTemplate">
              点击下载<i class="el-icon-download el-icon--right"></i>
            </el-button>
          </template>
@@ -115,6 +106,8 @@
        selection: true,
        column: column,
        labelWidth: 110,
                addTitle: "信息采集",
                addBtnText: "信息采集",
      },
    };
  },

 src/views/securityEquipment/gun.vue

@@ -1,8 +1,7 @@
<template>
  <basic-container>
    <div class="equipments">
      <avue-crud
        :option="option"
            <avue-crud :option="option"
        :data="data"
        :page.sync="page"
        ref="crudrec"
@@ -14,16 +13,13 @@
        @row-update="rowUpdate"
        @row-del="rowDel"
        @selection-change="selectionChange"
        @refresh-change="refreshChange"
      >
                       @refresh-change="refreshChange">
        <template slot="menuLeft">
          <el-button
            type="danger"
                    <el-button type="danger"
            size="small"
            plain
            icon="el-icon-delete"
            @click="handleDelete"
            >删 除
                               @click="handleDelete">删 除
          </el-button>
        </template>
      </avue-crud>
@@ -61,6 +57,8 @@
        selection: true,
        labelWidth:110,
        column: column,
                addTitle: "信息采集",
                addBtnText: "信息采集",
      },
    };
  },

 src/views/workreport/data.js

@@ -62,13 +62,13 @@
    viewDisplay: false,
},
{
    label: "汇报内容",
    label: "工作内容",
    prop: "content",
    type: "textarea",
    span: 24,
    rules: [{
        required: true,
        message: "请输入汇报内容",
        message: "请输入工作内容",
        trigger: "blur"
    }]
},
@@ -205,7 +205,7 @@
//     viewDisplay: false,
// },
{
    label: "汇报内容",
    label: "工作内容",
    prop: "content",
    type: "textarea",
    // editDisplay: false,
@@ -213,7 +213,7 @@
    span: 24,
    rules: [{
        required: true,
        message: "请输入汇报内容",
        message: "请输入工作内容",
        trigger: "blur"
    }]
},

 src/views/workreport/workreport.vue

@@ -1,7 +1,6 @@
<template>
  <basic-container class="workreply">
    <avue-crud
      :option="option"
        <avue-crud :option="option"
      :table-loading="loading"
      :data="data"
      :page.sync="page"
@@ -19,16 +18,13 @@
      @current-change="currentChange"
      @size-change="sizeChange"
      @refresh-change="refreshChange"
      @on-load="onLoad"
    >
                   @on-load="onLoad">
      <template slot="menuLeft">
        <el-button
          type="danger"
                <el-button type="danger"
          size="small"
          icon="el-icon-delete"
          plain
          @click="handleDelete"
          >删 除
                           @click="handleDelete">删 除
        </el-button>
      </template>
      <!-- <template slot-scope="{ type, size, row }" slot="menu">
@@ -80,9 +76,9 @@
        searchShow: true,
        searchMenuSpan: 6,
        border: true, //liu
        addBtnText: "发起",
                addTitle: "工作汇报",
                addBtnText: "工作汇报",
        saveBtnText: "发起",
        addTitle: "发起",
        index: true,
        stripe: true,
        viewBtn: true,