loulijun2021
2022-11-04 e6ae5aadd37952c9cf86d562322001394057050f
1.设备清单导入、物料清单导入前端对接
已修改2个文件
96 ■■■■ 文件已修改
src/views/sbgl/sbqd.vue 90 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/zzmx/wlqd.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sbgl/sbqd.vue
@@ -7,6 +7,8 @@
        <div style="display: flex">
          <el-button icon="el-icon-c-scale-to-original" @click="deviceTypeButton">设备类型</el-button>
          <el-button icon="el-icon-document-copy" @click="deviceGroupButton">设备组</el-button>
          <el-button icon="el-icon-download" @click="upload">导入</el-button>
        </div>
        <!--        <el-button type="primary" icon="el-icon-upload2" @click="upload">导入</el-button>-->
@@ -176,8 +178,14 @@
            width="120"
          >
            <template slot-scope="{row}">
              <div v-if="row.enable==='Y'"><svg-icon icon-class="circleYes" style="margin-right: 2px" />是</div>
              <div v-if="row.enable==='N'"><svg-icon icon-class="circleNo" style="margin-right: 2px" />否</div>
              <div v-if="row.enable==='Y'">
                <svg-icon icon-class="circleYes" style="margin-right: 2px" />
                是
              </div>
              <div v-if="row.enable==='N'">
                <svg-icon icon-class="circleNo" style="margin-right: 2px" />
                否
              </div>
            </template>
          </el-table-column>
          <el-table-column
@@ -421,7 +429,12 @@
          sortable="custom"
        >
          <template slot-scope="{row}">
            <el-input v-if="row.isVisible===1" v-model="row.code" oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')" placeholder="请输入" />
            <el-input
              v-if="row.isVisible===1"
              v-model="row.code"
              oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')"
              placeholder="请输入"
            />
            <div v-else> {{ row.code }}</div>
          </template>
        </el-table-column>
@@ -511,7 +524,12 @@
          sortable="custom"
        >
          <template slot-scope="{row}">
            <el-input v-if="row.isVisible===1"v-model="row.code" oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')" placeholder="请输入" />
            <el-input
              v-if="row.isVisible===1"
              v-model="row.code"
              oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')"
              placeholder="请输入"
            />
            <div v-else> {{ row.code }}</div>
          </template>
        </el-table-column>
@@ -588,6 +606,14 @@
    </el-dialog>
    <!--导入-->
    <import-picker
      ref="importPickerFunc"
      class="importPickerClass"
      :shows.sync="shows"
      :title="title_value"
      :colos="colos"
      :code="code"
    />
  </div>
</template>
@@ -605,11 +631,12 @@
  WorkShopSelect, WorkShopSelectLine
} from '@/api/sbgl'
import { handleDatetime, validateCode } from '@/utils/global'
import ImportPicker from '@/components/ImportPicker'
export default {
  name: 'SBQD',
  components: {
    Pagination
    Pagination, ImportPicker
  },
  data() {
    return {
@@ -697,7 +724,18 @@
        prop: 'code',
        order: 'desc'
      },
      DeviceGroupTotal: 0
      DeviceGroupTotal: 0,
      title_value: '数据导入 / 设备清单',
      code: '9',
      shows: false
    }
  },
  watch: {
    shows() {
      if (!this.shows) {
        this.getDeviceMangerSearch()
      }
    }
  },
  created() {
@@ -708,6 +746,14 @@
    this.getHeight()
  },
  methods: {
    // 设备清单导入
    upload() {
      this.shows = true
      this.$refs.importPickerFunc.newDataFunc()
    },
    colos() {
      this.shows = false
    },
    handleRequest() {
      // 获取设备清单列表
      this.getDeviceMangerSearch().then(res => {
@@ -760,11 +806,6 @@
    search() {
      this.getDeviceMangerSearch()
    },
    // 导入
    upload() {
    },
    // 重置
    reset() {
      this.form.DeviceCode = ''
@@ -1125,15 +1166,17 @@
<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-button--text{
  font-size: 14px ;
  cursor: pointer ;
::v-deep .el-button--text {
  font-size: 14px;
  cursor: pointer;
}
.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
  color: $main_color;
  cursor: pointer;
}
.el-icon-edit-outline{
.el-icon-edit-outline {
  margin-right: 15px;
}
@@ -1194,8 +1237,8 @@
  background-color: #f8f8fa;
}
::v-deep .el-table__body .el-table__row.hover-row td{
  background-color: #eaecef ;
::v-deep .el-table__body .el-table__row.hover-row td {
  background-color: #eaecef;
}
::v-deep .el-form--inline .el-form-item__label {
@@ -1211,20 +1254,23 @@
.body ::v-deep .el-form-item {
  margin-bottom: 0;
}
.userDialogVisible ::v-deep .el-form-item {
  margin-bottom: 0;
}
::v-deep .el-select__caret{
::v-deep .el-select__caret {
  display: flex;
  justify-content: center;
  align-items: 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;
  }
}
src/views/zzmx/wlqd.vue
@@ -3,7 +3,7 @@
    <div class="body" :style="{height:mainHeight+'px'}">
      <div class="bodyTopButtonGroup" style="justify-content: space-between">
        <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 icon="el-icon-download" @click="upload">导入</el-button>
      </div>
      <div class="bodyTopFormGroup">
@@ -660,8 +660,8 @@
        { code: 'F', name: '辅料' }
      ],
      title_value: '数据导入 / 点检部位',
      code: '4',
      title_value: '数据导入 / 物料清单',
      code: '21',
      shows: false
    }