1.提交

loulijun2021

2023-02-12 adb74c51618faf025fe1d46bf6b22db895c2608f

 src/views/sbgl/djjl.vue

@@ -2,9 +2,9 @@
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup">
        <!--        <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>-->
        <!--        <el-button icon="el-icon-download" @click="upload">导入</el-button>-->
        <el-button type="primary" icon="el-icon-download" @click="download">导出</el-button>
        <!--        <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">新增</el-button>-->
        <!--        <el-button v-waves icon="el-icon-download" @click="upload">导入</el-button>-->
        <el-button v-waves type="primary" icon="el-icon-download" @click="download">导出</el-button>
      </div>

      <div class="bodyTopFormGroup">
@@ -13,10 +13,10 @@
          :model="form"
          label-width="100px"
          inline
          style="display: flex;justify-content: space-between"
          style="display: flex;"
        >
          <div class="elForm" style="justify-content: flex-start">
            <el-form-item label-width="70px" label="生产车间" style=" display: flex;">
            <el-form-item label="生产车间" style=" display: flex;">
              <el-select v-model="form.wkshopcode" style="width: 200px" placeholder="请选择">
                <el-option
                  v-for="item in wkshopSelectArr"
@@ -35,7 +35,7 @@
            <el-form-item label="标准名称" style=" display: flex;">
              <el-input v-model="form.stanedname" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label-width="70px" label="点检人员" style=" display: flex;">
            <el-form-item v-show="isExpandForm" label="点检人员" style=" display: flex;">
              <el-input v-model="form.checkuser" style="width: 200px" placeholder="请输入" />
            </el-form-item>
            <el-form-item v-show="isExpandForm" label="点检时间" style=" display: flex;font-size:14px;align-items: center">
@@ -62,9 +62,9 @@
            <!--              </el-select>-->
            <!--            </el-form-item>-->
          </div>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
            <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}">
            <el-button v-waves type="primary" icon="el-icon-search" @click="search">查询</el-button>
            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">重置</el-button>
          </div>
        </el-form>
        <div
@@ -110,31 +110,37 @@
            prop="djwo"
            label="点检单号"
            sortable="custom"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="org_name"
            label="生产车间"
            sortable="custom"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="eqp_code"
            label="设备编号"
            sortable="custom"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="eqp_name"
            label="设备名称"
            sortable="custom"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="stanedcode"
            label="点检标准编码"
            width="160"
            sortable="custom"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="stanedname"
            label="点检标准名称"
            show-tooltip-when-overflow
            width="160"
            sortable="custom"
          />
@@ -142,6 +148,7 @@
            prop="chk_user"
            label="点检人员"
            width="160"
            show-tooltip-when-overflow
            sortable="custom"
          >
            <template slot-scope="{row}">
@@ -153,16 +160,27 @@
            prop="chk_result"
            label="点检结果"
            width="160"
            show-tooltip-when-overflow
            sortable="custom"
          >
            <template slot-scope="{row}">
              <div v-if="row.chk_result==='OK'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />正常</div>
              <div v-if="row.chk_result==='NG'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />异常</div>
              <div v-if="row.chk_result==='OK'" style="display: flex;align-items: center">
                <!--                <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />-->
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />

                正常
              </div>
              <div v-if="row.chk_result==='NG'" style="display: flex;align-items: center">
                <!--                <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />-->
                <i class="el-icon-info" style="margin-right: 2px" />
                异常
              </div>
            </template>
          </el-table-column>
          <el-table-column
            prop="chk_date"
            label="点检时间"
            show-tooltip-when-overflow
            width="160"
            sortable="custom"
          />
@@ -182,7 +200,8 @@
              <!--              </div>-->
              <i
                class="el-icon-tickets"
                style="cursor: pointer;color: #42b983;margin-right: 15px"
                :style="{color:$store.state.settings.theme}"
                style="cursor: pointer;margin-right: 15px"
                @click="edit('edit',row)"
              />
            </template>
@@ -202,6 +221,7 @@
    </div>

    <el-dialog
      v-el-drag-dialog
      :title="operation==='add'?'新增':'点检明细'"
      :visible.sync="dialogVisible"
      width="800px"
@@ -242,8 +262,16 @@
            label="点检结果"
          >
            <template slot-scope="{row}">
              <div v-if="row.result==='OK'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />正常</div>
              <div v-if="row.result==='NG'" style="display: flex;align-items: center"><div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />异常</div>
              <div v-if="row.result==='OK'" style="display: flex;align-items: center">
                <!--                <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: #42b983" />-->
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                正常
              </div>
              <div v-if="row.result==='NG'" style="display: flex;align-items: center">
                <!--                <div style="margin-right: 5px;width:10px;height: 10px;border-radius: 50%;background-color: red" />-->
                <i class="el-icon-info" style="margin-right: 2px" />
                异常
              </div>
            </template>
          </el-table-column>
          <el-table-column
@@ -260,9 +288,9 @@

      <span slot="footer" class="dialog-footer">
        <div class="footerButton">
          <el-button @click="dialogVisible = false">返 回</el-button>
          <!--          <el-button @click="dialogVisibleCancel">取 消</el-button>-->
          <!--          <el-button type="primary" @click="dialogVisibleConfirm">确 定</el-button>-->
          <el-button v-waves @click="dialogVisible = false">返 回</el-button>
          <!--          <el-button v-waves @click="dialogVisibleCancel">取 消</el-button>-->
          <!--          <el-button v-waves type="primary" @click="dialogVisibleConfirm">确 定</el-button>-->
        </div>
      </span>
    </el-dialog>
@@ -288,12 +316,15 @@
import { handleDatetime, validateCode } from '@/utils/global'
import { DeviceCheckSubTakeSearch, DeviceCheckTakeOutExcel, DeviceCheckTakeSearch } from '@/api/sbgl'
import { ShopSearch } from '@/api/dzkb'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'

export default {
  name: 'Zzjg',
  components: {
    Pagination, ImportPicker
  },
  directives: { elDragDialog, waves },
  data() {
    return {
      mouseHoverType: 'mouseout',
@@ -426,7 +457,7 @@
      this.dialogVisible = true
    },
    // 修改按钮
    async  edit(operation, row) {
    async edit(operation, row) {
      this.operation = operation
      this.dialogVisible = true

@@ -530,16 +561,19 @@
<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-range__icon{
::v-deep .el-range__icon {
  line-height: 28px !important;
}
::v-deep .el-range-separator{

::v-deep .el-range-separator {
  line-height: 28px !important;
}
::v-deep .el-range-input{

::v-deep .el-range-input {
  font-size: 14px;
}
::v-deep .el-range-separator{

::v-deep .el-range-separator {
  display: flex;
  justify-content: center;
  align-items: center;
@@ -647,11 +681,12 @@
  justify-content: center;
}

.tableFixed{
  ::v-deep .el-table__fixed-right{
.tableFixed {
  ::v-deep .el-table__fixed-right {
    height: 100% !important;
  }
  ::v-deep .el-table__fixed{

  ::v-deep .el-table__fixed {
    height: 100% !important;
  }
}