Merge branch 'master' of http://120.24.23.155:9999/r/sunsail-platform-ui

yijiusmile

2021-02-20 70890453cdb94ab59652b07dfca493922118466d

Merge branch 'master' of http://120.24.23.155:9999/r/sunsail-platform-ui

 src/views/yunpan/fujian.vue

@@ -144,7 +144,9 @@
            </el-col>

          </el-row>

        </el-form>

        <el-row style="margin: 10px;">

      </el-header>

      <el-main>

        <el-row style="margin-bottom: 10px;">

          <el-col :span="24">

            <el-button class="hr-but-all" type="danger" @click="dialogFormVisible = true">新建标签</el-button>

            <el-popconfirm title="是否删除标签？" @onConfirm="deldialogFormVisible = true">

@@ -256,50 +258,46 @@


          </el-col>

        </el-row>

      </el-header>

      <el-dialog title="附件管理" :visible.sync="dialogShowUploadfj" :fullscreen="true">

        <uploadfj v-if="dialogShowUploadfj" :rowitem="rowitem" @cancleChooseUser="cancleChooseUser()" />

      </el-dialog>

      <el-container>

        <el-main>

          <el-table ref="empAccessoryTable" :data="tableData" class="fj-table" style="width: 100%;height: 480px;color: #000;">

            <el-table-column

              type="selection"

              width="55"

            />

            <el-table-column label="操作" width="120">

        <el-dialog title="附件管理" :visible.sync="dialogShowUploadfj" width="80%" class="fjgl-class" top="10px">

          <uploadfj v-if="dialogShowUploadfj" :rowitem="rowitem" @cancleChooseUser="cancleChooseUser()" />

        </el-dialog>

        <el-table ref="empAccessoryTable" :data="tableData" class="fj-table" style="width: 100%;color: #000;">

          <el-table-column

            type="selection"

            width="55"

          />

          <el-table-column label="操作" width="120">

            <template slot-scope="scope">

              <el-button

                type="text"

                size="small"

                @click.native.prevent="dialogShow(scope.$index, scope.row)"

              >

                上传

              </el-button>

            </template>

          </el-table-column>

          <el-table-column prop="empName" label="姓名" width="100" />

          <el-table-column prop="certificateNumb" label="身份证号" width="180" />

          <el-table-column prop="deptName" label="护卫点(部门)" width="180" />

          <el-table-column prop="jobName" label="岗位" width="100" />

          <template v-for="(col) in labelData">

            <el-table-column :key="col.labelid" :prop="col.labelcode" :label="col.labelname">

              <template slot-scope="scope">

                <el-button

                  type="text"

                  size="small"

                  @click.native.prevent="dialogShow(scope.$index, scope.row)"

                >

                  上传

                </el-button>

                <el-link type="primary"> {{ scope.row[col.labelcode] }}</el-link>

              </template>

            </el-table-column>

            <el-table-column prop="empName" label="姓名" width="100" />

            <el-table-column prop="certificateNumb" label="身份证号" width="180" />

            <el-table-column prop="deptName" label="护卫点(部门)" width="180" />

            <el-table-column prop="jobName" label="岗位" width="100" />

            <template v-for="(col) in labelData">

              <el-table-column :key="col.labelid" :prop="col.labelcode" :label="col.labelname">

                <template slot-scope="scope">

                  <el-link type="primary"> {{ scope.row[col.labelcode] }}</el-link>

                </template>

              </el-table-column>

            </template>

          </template>



          </el-table>

          <pagination

            v-show="total>0"

            :total="total"

            :page.sync="pagination.num"

            :limit.sync="pagination.size"

            @pagination="search"

          />

        </el-main>

      </el-container>

        </el-table>

        <pagination

          v-show="total>0"

          :total="total"

          :page.sync="pagination.num"

          :limit.sync="pagination.size"

          @pagination="search"

        />

      </el-main>

    </el-container>

  </div>

</template>

@@ -354,10 +352,10 @@
      },

      total: 0, // 总数量

      pagination: { // 分页参数

        size: 5,

        size: 10,

        num: 1

      },

      headerHeight: '70px',

      headerHeight: '20px',

      advancedQueryShow: false,

      dialogTableVisible: false,

      pickerOptions: {

@@ -533,7 +531,7 @@
        this.headerHeight = '70px'

        this.advancedQueryShow = false

      } else {

        this.headerHeight = '380px'

        this.headerHeight = '330px'

        this.advancedQueryShow = true

      }

    },

@@ -546,13 +544,16 @@
<style lang="scss" scoped>

.el-main {

    margin-top: 10px;

    height: 600px;

}

.el-input-number {

    width: 100%;

}

</style>

<style lang="scss">

.fjgl-class{

    height: 90%;

     overflow: auto;

}

.add-lable {

    text-align: initial;

}


 src/views/yunpan/uploadfj.vue

@@ -47,14 +47,14 @@
            />提示：文件不要超过10个，单个文件大小不超过50M，单击或者拖动文件到下面区域，支持单个或批量文件的上传。</el-col>
          </el-row>
          <el-row style="background-color: rgba(0,0,0,0.2);">
            <el-col :span="19">
            <el-col :span="16">
              <el-checkbox
                v-model="checkAll"
                class="myRedCheckBox"
                style="color: #000; margin-left: 20px;"
                @change="checkAllMethods()"
              >全选</el-checkbox></el-col>
            <el-col :span="5">
            <el-col :span="8">
              <el-button
                type="primary"
                icon="el-icon-download"