1.生产入库实现30%

loulijun2021

2023-05-30 c4cbb29fd3dd2f43da4f9af9967936edb86d1dcc

1.生产入库实现30%

 src/api/produceManager.js

@@ -417,3 +417,30 @@
    params: data
  })
}

// ç”Ÿäº§å…¥åº“信息查询
export function ProductInHouseOrderSearch(data) {
  return request({
    url: 'ProductionManagement/ProductInHouseOrderSearch',
    method: 'get',
    params: data
  })
}

// ç”Ÿäº§å…¥åº“获取单据号
export function ProductInHouseOrderCodeSearch(data) {
  return request({
    url: 'ProductionManagement/ProductInHouseOrderCodeSearch',
    method: 'post',
    data
  })
}

// æäº¤
export function ProductInHouseOrderSeave(data) {
  return request({
    url: 'ProductionManagement/ProductInHouseOrderSeave',
    method: 'post',
    data
  })
}

 src/router/index.js

@@ -1096,6 +1096,12 @@
        code: '1076',
        component: () => import('@/views/produceManager/AutoScheduling'),
        meta: { code: '1076', title: '自动排程', icon: '', keepAlive: true }
      }, {
        path: 'productWarehouse',
        name: 'productWarehouseCancel',
        code: '1077',
        component: () => import('@/views/produceManager/productWarehouse'),
        meta: { code: '1077', title: '生产入库', icon: '', keepAlive: true }
      }
    ]
  },

 src/views/produceManager/produceStartOrder.vue

@@ -2170,7 +2170,7 @@
            // å½“为末道的时候
            if (this.dialogForm.nextstepcode === '') {
              const D = {
                rightcode: '2064',
                rightcode: '1078',
                partcode: this.dialogForm.partcode,
                qty: this.dialogForm.sqty,
                onelabqty: this.dialogForm.sqty

 src/views/produceManager/productWarehouse.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,727 @@
<template>
  <div>
    <div class="body" :style="{height:mainHeight+'px'}">
      <!--      <div class="bodyTopButtonGroup" style="justify-content: space-between">-->
      <!--        <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>-->
      <!--      </div>-->

      <div
        class="bodyTopFormGroup"
        style="margin-top: 10px"
        :style="{height:(mainHeight-20)+'px'}"
      >
        <div style="display: flex;align-items: center">
          <i
            class="el-icon-s-operation"
            :style="{color:$store.state.settings.theme,fontSize:'14px'}"
          />
          <div style="font-size: 14px;margin-left: 5px;color: #a7a7a7">
            æŸ¥è¯¢é¡¹
          </div>
        </div>
        <el-form
          ref="form"
          :model="form"
          label-width="100px"
          inline
          style="display: flex;"
        >
          <div class="elForm" style="display: flex;flex-direction: column">
            <div style="display: flex">
              <el-form-item label="单据类型" style=" display: flex;">
                <el-select
                  v-model="form.documentType"
                  :popper-append-to-body="false"
                  filterable
                  style="width: 200px"
                  placeholder="请选择"
                  @change="getProductInHouseOrderSearch"
                >
                  <el-option
                    v-for="item in documentTypeArr"
                    :key="item.value"
                    :label="item.label"
                    :value="item.value"
                  />
                </el-select>
              </el-form-item>
              <el-form-item
                v-if="form.documentType==='Y'"
                label="生产订单"
                style=" display: flex;"
              >
                <el-input
                  v-model="form.erpordercode"
                  placeholder="请输入"
                  style="width: 200px"
                  @input="getProductInHouseOrderSearch"
                />
              </el-form-item>
              <el-form-item label="生产工单" style=" display: flex;">
                <el-input
                  v-model="form.mesordercode"
                  placeholder="请输入"
                  style="width: 200px"
                  @input="getProductInHouseOrderSearch"
                />
              </el-form-item>
              <el-form-item
                v-if="form.documentType==='Y'"
                label="销售订单"
                style="display: flex;"
              >
                <el-input v-model="form.saleOrderCode" placeholder="请输入" style="width: 200px" @input="getProductInHouseOrderSearch" />
              </el-form-item>
            </div>

            <div style="display: flex">
              <el-form-item label="产品编码" style=" display: flex;">
                <el-input v-model="form.partcode" placeholder="请输入" style="width: 200px" />
              </el-form-item>
              <el-form-item label="产品名称" style=" display: flex;">
                <el-input v-model="form.partname" style="width: 200px" placeholder="请输入" />
              </el-form-item>
              <el-form-item label="产品规格" style=" display: flex;">
                <el-input v-model="form.partspec" style="width: 200px" placeholder="请输入" />
              </el-form-item>
              <el-form-item
                label="工单日期"
                style=" display: flex;font-size: 14px;margin-top: 3px;margin-bottom: -3px"
              >
                <el-date-picker
                  v-model="form.paystartdate"
                  type="daterange"
                  range-separator="~"
                  class="timeMini"
                  size="mini"
                  style="width: 200px;display: flex;line-height: 34px;height: 34px;"
                  :clearable="false"
                  start-placeholder="开始日期"
                  end-placeholder="结束日期"
                />
              </el-form-item>
            </div>

          </div>
          <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 style="display: flex;align-items: center">
          <i
            class="el-icon-s-operation"
            :style="{color:$store.state.settings.theme,fontSize:'14px'}"
          />
          <div style="font-size: 14px;margin-left: 5px;color: #a7a7a7">
            é€‰æ‹©é¡¹
          </div>
        </div>
        <el-form
          ref="form"
          :model="form"
          label-width="100px"
          inline
          style="display: flex;"
        >
          <div class="elForm">
            <el-form-item label="单据日期" style=" display: flex;">
              <el-date-picker
                v-model="form.lm_date"
                style="width: 200px"
                type="date"
                placeholder="选择日期"
              />            </el-form-item>
            <el-form-item label="单据编号" style=" display: flex;">
              <el-input v-model="form.OrgName" placeholder="请输入" style="width: 200px" />
            </el-form-item>
            <el-form-item label="生产车间" style=" display: flex;">
              <el-select
                v-model="form.WorkShop"
                :popper-append-to-body="false"
                filterable
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in WorkShopArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>            </el-form-item>
            <el-form-item label="入库仓库" style=" display: flex;">
              <el-select
                v-model="form.stockcode"
                :popper-append-to-body="false"
                filterable
                style="width: 200px"
                placeholder="请选择"
              >
                <el-option
                  v-for="item in stockcodeArr"
                  :key="item.code"
                  :label="item.name"
                  :value="item.code"
                />
              </el-select>
            </el-form-item>

          </div>
          <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-s-promotion" @click="search">入库提交</el-button>
            <!--            <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">重置</el-button>-->
          </div>
        </el-form>
        <div style="display: flex;align-items: center">
          <i
            class="el-icon-s-operation"
            :style="{color:$store.state.settings.theme,fontSize:'14px'}"
          />
          <div style="font-size: 14px;margin-left: 5px;color: #a7a7a7">
            ä¿¡æ¯æ 
          </div>
        </div>
        <div style="padding:0 10px;position: relative">
          <!--          <el-button-->
          <!--            v-waves-->
          <!--            type="primary"-->
          <!--            style="position: absolute;right: 10px;top: 10px;z-index: 10"-->
          <!--            icon="el-icon-s-promotion"-->
          <!--            @click=""-->
          <!--          >入库提交-->
          <!--          </el-button>-->
          <el-tabs style="margin-top: 10px;">
            <el-tab-pane label="明细">
              <div class="elTableDiv" style="margin: 0 auto 10px;">
                <el-table
                  v-show="form.documentType==='Y'"
                  ref="tableDataRef"
                  class="tableFixed"
                  :data="tableDataDetail"
                  :height="(tableHeight-25)+'px'"
                  border
                  :row-class-name="tableRowClassName"
                  :style="{width: 100+'%',height:(tableHeight-25)+'px',}"
                  highlight-current-row
                  :header-cell-style="this.$headerCellStyle"
                  :cell-style="this.$cellStyle"
                  @selection-change="handleSelectionChange"
                >
                  <el-table-column
                    type="selection"
                    width="50"
                    fixed
                  />
                  <el-table-column
                    type="index"
                    width="50"
                    fixed
                    label="序号"
                  />

                  <el-table-column
                    prop="stockname"
                    label="仓库"
                    width="110"
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.stockname">{{ row.stockname }}</div>
                      <div v-else>/</div>
                    </template>
                  </el-table-column>
                  <el-table-column
                    prop="inbarcode"
                    label="入库条码"
                    width="160"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="m_po"
                    label="订单编号"
                    width="160"
                    show-tooltip-when-overflow
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.m_po">{{ row.m_po }}</div>
                      <div v-else>/</div>
                    </template>
                  </el-table-column>
                  <el-table-column
                    prop="wo_code"
                    label="工单编号"
                    width="160"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="partcode"
                    label="产品编码"
                    width="160"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="partname"
                    label="产品名称"
                    width="160"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="partspec"
                    label="产品规格"
                    width="160"
                    show-tooltip-when-overflow
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.stockname">{{ row.stockname }}</div>
                      <div v-else>/</div>
                    </template>
                  </el-table-column>

                  <el-table-column
                    prop="qty"
                    label="订单数量"
                    min-width="95"
                    fixed="right"
                    show-tooltip-when-overflow
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.qty">{{ row.qty }}</div>
                      <div v-else>/</div>
                    </template>
                  </el-table-column>
                  <el-table-column
                    prop="plan_qty"
                    label="工单数量"
                    min-width="95"
                    fixed="right"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="good_qty"
                    label="完工数量"
                    min-width="95"
                    fixed="right"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="inhouseqty"
                    label="已入库数量"
                    min-width="95"
                    fixed="right"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="stinhouseqty"
                    label="可入库数量"
                    min-width="95"
                    fixed="right"
                    show-tooltip-when-overflow
                  />
                </el-table>
                <el-table
                  v-show="form.documentType==='N'"
                  ref="tableDataRef"
                  class="tableFixed"
                  :data="tableDataDetail"
                  :height="(tableHeight-25)+'px'"
                  border
                  :row-class-name="tableRowClassName"
                  :style="{width: 100+'%',height:(tableHeight-25)+'px',}"
                  highlight-current-row
                  :header-cell-style="this.$headerCellStyle"
                  :cell-style="this.$cellStyle"
                  @selection-change="handleSelectionChange"
                >
                  <el-table-column
                    type="selection"
                    width="50"
                    fixed
                  />
                  <el-table-column
                    type="index"
                    width="50"
                    fixed
                    label="序号"
                  />

                  <el-table-column
                    prop="stockname"
                    label="仓库"
                    width="110"
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.stockname">{{ row.stockname }}</div>
                      <div v-else>/</div>
                    </template>
                  </el-table-column>
                  <el-table-column
                    prop="inbarcode"
                    label="入库条码"
                    width="160"
                    show-tooltip-when-overflow
                  />
                  <!--                  <el-table-column-->
                  <!--                    prop="m_po"-->
                  <!--                    label="订单编号"-->
                  <!--                    width="160"-->
                  <!--                    show-tooltip-when-overflow-->
                  <!--                  >-->
                  <!--                    <template slot-scope="{row}">-->
                  <!--                      <div v-if="row.m_po">{{ row.m_po }}</div>-->
                  <!--                      <div v-else>/</div>-->
                  <!--                    </template>-->
                  <!--                  </el-table-column>-->
                  <el-table-column
                    prop="wo_code"
                    label="工单编号"
                    width="160"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="partcode"
                    label="产品编码"
                    width="160"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="partname"
                    label="产品名称"
                    width="160"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="partspec"
                    label="产品规格"
                    width="160"
                    show-tooltip-when-overflow
                  >
                    <template slot-scope="{row}">
                      <div v-if="row.stockname">{{ row.stockname }}</div>
                      <div v-else>/</div>
                    </template>
                  </el-table-column>

                  <!--                  <el-table-column-->
                  <!--                    prop="qty"-->
                  <!--                    label="订单数量"-->
                  <!--                    min-width="95"-->
                  <!--                    fixed="right"-->
                  <!--                    show-tooltip-when-overflow-->
                  <!--                  >-->
                  <!--                    <template slot-scope="{row}">-->
                  <!--                      <div v-if="row.qty">{{ row.qty }}</div>-->
                  <!--                      <div v-else>/</div>-->
                  <!--                    </template>-->
                  <!--                  </el-table-column>-->
                  <el-table-column
                    prop="plan_qty"
                    label="工单数量"
                    min-width="95"
                    fixed="right"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="good_qty"
                    label="完工数量"
                    min-width="95"
                    fixed="right"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="inhouseqty"
                    label="已入库数量"
                    min-width="95"
                    fixed="right"
                    show-tooltip-when-overflow
                  />
                  <el-table-column
                    prop="stinhouseqty"
                    label="可入库数量"
                    min-width="95"
                    fixed="right"
                    show-tooltip-when-overflow
                  />
                </el-table>
              </div>
            </el-tab-pane>
            <el-tab-pane label="汇总">汇总</el-tab-pane>
          </el-tabs>
        </div>

      </div>

    </div>

  </div>
</template>

<script>
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import { WareHouseSelect } from '@/api/materialManager'
import { ProductInHouseOrderSearch } from '@/api/produceManager'
import { handleDatetime } from '@/utils/global'
import { WorkShopSelect } from '@/api/deviceManager'

export default {
  name: 'Zzjg',
  components: {},
  directives: { elDragDialog, waves },
  data() {
    return {
      mainHeight: 0,
      tableHeight: 0,
      form: {
        documentType: 'Y', // å•æ®ç±»åž‹

        erpordercode: '', // è®¢å•ç¼–号
        mesordercode: '', // å·¥å•ç¼–号
        partcode: '', // äº§å“ç¼–码
        partname: '', // äº§å“åç§°
        partspec: '', // è§„格型号
        orderdate: '', // å·¥å•æ—¥æœŸ

        saleOrderCode: '', // é”€å”®è®¢å•
        WorkShop: '', // ç”Ÿäº§è½¦é—´
        lm_date: '', // å•æ®æ—¥æœŸ
        stockcode: '', // å…¥åº“仓库
        xxx: ''
      },
      documentTypeArr: [
        { label: '有源单', value: 'Y' },
        { label: '无源单', value: 'N' }
      ],
      tableDataDetail: [],
      multipleSelection: [],
      stockcodeArr: [], // å…¥åº“仓库数组
      WorkShopArr: [], // ç”Ÿäº§è½¦é—´æ•°ç»„

      xxx: ''

    }
  },
  watch: {},
  created() {
    this.handleRequest()
  },
  mounted() {
    window.addEventListener('resize', this.getHeight)
    this.getHeight()
  },
  methods: {
    handleRequest() {
      this.getProductInHouseOrderSearch().then(res => {
        if (res.code === '200') {
          this.getWareHouseSelect()
          this.getWorkShopSelect()
        }
      })
    },
    async  getProductInHouseOrderSearch() {
      let tempDate = this.form.orderdate
      if (tempDate.length > 0) {
        tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
      }
      const data = {
        erpordercode: this.form.erpordercode, // è®¢å•ç¼–号
        mesordercode: this.form.mesordercode, // å·¥å•ç¼–号
        partcode: this.form.partcode, // äº§å“ç¼–码
        partname: this.form.partname, // äº§å“åç§°
        partspec: this.form.partspec, // è§„格型号
        orderdate: tempDate// å·¥å•æ—¥æœŸ
      }
      const res = await ProductInHouseOrderSearch(data)
      // this.tableDataDetail = res.data

      // æ ¹æ®åŽŸå•åšè¿‡æ»¤
      this.tableDataDetail = res.data.filter(i => this.form.documentType === 'Y' ? i.m_po : !i.m_po)

      this.$nextTick(() => {
        this.$refs.tableDataRef.doLayout()
      })
      return { code: res.code }
    },
    // èŽ·å–仓库接口
    async getWareHouseSelect() {
      const { data: res } = await WareHouseSelect()
      this.stockcodeArr = res
    },
    // èŽ·å–所属车间
    async getWorkShopSelect() {
      const { data: res } = await WorkShopSelect()
      this.WorkShopArr = res
    },

    // é‡ç½®
    reset() {
      this.form.OrgCode = ''
      this.form.OrgName = ''
      this.form.OrgType = ''
      this.form.UserName = ''
      this.getOrganizationSearch()
    },

    handleSelectionChange(val) {
      this.multipleSelection = val
    },

    // èŽ·å–页面高度
    getHeight() {
      this.$nextTick(() => {
        this.mainHeight = window.innerHeight - 85
        this.tableHeight = this.mainHeight - 255
        this.$refs.tableDataRef.doLayout()
      })
    },
    tableRowClassName({ row, rowIndex }) {
      return 'custom-row'
    }
  }
}
</script>

<!--公共页面样式-->
<style lang="scss" scoped>
$main_color: #42b983;
::v-deep .el-range__icon {
  line-height: 28px !important;
}

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

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

::v-deep .el-range-separator {
  display: flex;
  justify-content: center;
  align-items: center;
}

::v-deep .el-button--text {
  font-size: 14px;
  cursor: pointer;
}

.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
  color: $main_color;
  cursor: pointer;
}

.el-icon-edit-outline {
  margin-right: 15px;
}

::v-deep .el-button--primary, .el-button--default, .el-button--info {
  height: 34px;
  display: flex;
  align-items: center;
  padding: 0 15px;
}

::v-deep .el-button--primary {
  //background-color: $main_color !important;
}

::v-deep .el-button--default {
  background-color: #f8f8fa;
  border: none;
}

::v-deep .el-input__inner {
  height: 34px;
  line-height: 34px;
  //color: #a7a7a7;
}

::v-deep .el-dialog__body {
  padding: 20px 100px !important;
}

::v-deep .dialogVisibleRoles .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .importPickerClass .el-dialog__body {
  padding: 20px 20px !important;
}

::v-deep .el-dialog__footer {
  display: flex;
  justify-content: flex-end;
}

::v-deep .el-table .caret-wrapper {
  transform: scale(0.8);
}

::v-deep .cell {
  display: flex;
  align-items: center;
  justify-content: space-between;
}

::v-deep .el-table::before {
  height: 0;
}

::v-deep .el-table__body-wrapper {
  background-color: #f8f8fa;
}

::v-deep .el-table__body .el-table__row.hover-row td {
  background-color: #eaecef;
}

::v-deep .el-form--inline .el-form-item__label {
  color: #a7a7a7;
}

.body ::v-deep .el-divider {
  border: 1px solid #eee;
  width: 99%;
  margin: 10px auto;
}

.body ::v-deep .el-form-item {
  margin-bottom: 0;
}

.userDialogVisible ::v-deep .el-form-item {
  margin-bottom: 0;
}

::v-deep .el-select__caret {
  display: flex;
  align-items: center;
  justify-content: center;
}

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

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

::v-deep .el-tabs__item {
  padding-right: 0;
}
</style>
<style>

.el-table .custom-row {
  background: #f8f8fa;
}
</style>

 src/views/qualityManager/processCheckRecord.vue

@@ -178,6 +178,7 @@
    >
      <div class="elTableDiv">
        <el-table
          ref="tableDataRef2"
          :data="tableDataDialog"
          :height="(tableHeight-100)+'px'"
          border
@@ -199,63 +200,135 @@
            fixed
          />

          <el-table-column
            prop="checkitem_code"
            show-tooltip-when-overflow
            label="检验项目编号"
            width="120"
          />
          <!--          <el-table-column-->
          <!--            prop="checkitem_code"-->
          <!--            show-tooltip-when-overflow-->
          <!--            label="检验项目编号"-->
          <!--            width="120"-->
          <!--          />-->
          <el-table-column
            prop="checkitem_name"
            label="检验项目名称"
            fixed
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="checkitem_descr"
            label="检验项目描述"
            show-tooltip-when-overflow
          />
          <el-table-column
            prop="check_result"
            label="检验结果"
            show-tooltip-when-overflow
            width="120"
          >
            <template slot-scope="{row}">
              <div v-if="row.check_result==='NG'">
                <i class="el-icon-info" style="margin-right: 2px" />
                ä¸è‰¯
              </div>
              <div v-if="row.check_result==='OK'">
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                åˆæ ¼
              </div>
            </template>
          </el-table-column>
          <el-table-column
            prop="lm_user"
            label="检验人员"
            show-tooltip-when-overflow
            width="120"
          />
          <el-table-column
            prop="lm_date"
            label="检验时间"
            show-tooltip-when-overflow
            width="160"
          />
          <!--          <el-table-column-->
          <!--            label="操作"-->
          <!--            fixed="right"-->
          <!--            width="120"-->
          <!--          >-->
          <!--            <template slot-scope="{row}">-->
          <!--              <div class="operationClass">-->
          <!--                <el-button v-waves type="text" @click="check(row)">查看</el-button>-->
          <!--                &lt;!&ndash;                <el-button v-waves type="text" @click="del(row)">删除</el-button>&ndash;&gt;-->
          <!--              </div>-->
          <!--            </template>-->
          <!--          </el-table-column>-->
          <!--            prop="checkitem_descr"-->
          <!--            label="检验项目描述"-->
          <!--            show-tooltip-when-overflow-->
          <!--          />-->
          <el-table-column
            prop="standvalue"
            label="标准要求"
            fixed
            min-width="120"
            show-tooltip-when-overflow
          >
            <template slot-scope="{row}">
              <!--        ~当三个值都有    -->
              <div v-if="row.standvalue&&row.uppervalue&&row.lowervalue">{{ row.standvalue }}({{
                row.lowervalue
              }}~{{ row.uppervalue }})
              </div>
              <!--            ~当只有标准值和上限值时  -->
              <div v-else-if="row.standvalue&&row.uppervalue">{{ row.standvalue }}(~{{ row.uppervalue }})</div>
              <!--            ~当只有标准值和下限值时-->
              <div v-else-if="row.standvalue&&row.lowervalue">{{ row.standvalue }}({{ row.lowervalue }}~)</div>

              <!--            ~当只有上限值和下限值时-->
              <div v-else-if="row.uppervalue&&row.lowervalue">({{ row.lowervalue }}~{{ row.uppervalue }})</div>
              <!--            ~当只有标准值时     -->
              <div v-else-if="row.standvalue">{{ row.standvalue }}</div>
              <!--            ~当只有上限值时       -->
              <div v-else-if="row.uppervalue">(~{{ row.uppervalue }})</div>
              <!--            ~当只有下限值时      -->
              <div v-else-if="row.lowervalue">({{ row.lowervalue }}~)</div>

              <div v-else>/</div>

            </template>
          </el-table-column>

          <el-table-column
            v-for="(item,index) in dialogTableArrayCol"
            :key="item"
            :prop="(index+1)+'/'+ dialogTableNumberCol"
            :label="'第'+(index+1)+'件'"
            show-tooltip-when-overflow
            min-width="100"
          >
            <template slot-scope="{row}">
              <div style="display: flex;align-items: center">
                <i
                  :class="row.check_result==='OK'?'el-icon-success':'el-icon-error'"
                  :style="{color:row.check_result==='OK'?$store.state.settings.theme:'red'}"
                  style="margin-right: 2px"
                />
                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
              </div>

              <!--            &lt;!&ndash;        ~当三个值都有    &ndash;&gt;-->
              <!--            <div v-if="row.standvalue&&row.uppervalue&&row.lowervalue&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
              <!--              &lt;!&ndash;            <div v-if="row[(index + 1) + '/' + dialogTableNumberCol]>=row.lowervalue&&row[(index + 1) + '/' + dialogTableNumberCol]<=row.uppervalue">&ndash;&gt;-->
              <!--              <div style="display: flex;align-items: center">-->
              <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
              <!--              </div>-->
              <!--            </div>-->

              <!--            &lt;!&ndash;            ~当只有标准值和上限值时  &ndash;&gt;-->
              <!--            <div v-else-if="row.standvalue&&row.uppervalue&&row.lowervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
              <!--              <div style="display: flex;align-items: center">-->
              <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
              <!--              </div>-->
              <!--            </div>-->
              <!--            &lt;!&ndash;            ~当只有标准值和下限值时&ndash;&gt;-->
              <!--            <div v-else-if="row.standvalue&&row.lowervalue&&row.uppervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)">-->
              <!--              <div style="display: flex;align-items: center">-->
              <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
              <!--              </div>-->
              <!--            </div>-->

              <!--            &lt;!&ndash;            ~当只有上限值和下限值时&ndash;&gt;-->
              <!--            <div v-else-if="row.uppervalue&&row.lowervalue&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
              <!--              <div style="display: flex;align-items: center">-->
              <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
              <!--              </div>-->
              <!--            </div>-->
              <!--            &lt;!&ndash;            ~当只有标准值时     &ndash;&gt;-->
              <!--            <div v-else-if="row.standvalue&&row.uppervalue===''&&row.lowervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])===parseFloat(row.standvalue)">-->
              <!--              <div style="display: flex;align-items: center">-->
              <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
              <!--              </div>-->
              <!--            </div>-->
              <!--            &lt;!&ndash;            ~当只有上限值时       &ndash;&gt;-->
              <!--            <div v-else-if="row.uppervalue&&row.lowervalue===''&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
              <!--              <div style="display: flex;align-items: center">-->
              <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
              <!--              </div>-->
              <!--            </div>-->

              <!--            &lt;!&ndash;            ~当只有下限值时      &ndash;&gt;-->
              <!--            <div v-else-if="row.lowervalue&& row.uppervalue===''&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)">-->
              <!--              <div style="display: flex;align-items: center">-->
              <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
              <!--              </div></div>-->

              <!--            <div v-else>-->
              <!--              <div style="display: flex;align-items: center">-->
              <!--                <i class="el-icon-error" style="color: red;margin-right: 2px" />-->
              <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
              <!--              </div>-->
              <!--            </div>-->

            </template>
          </el-table-column>
        </el-table>
      </div>
      <span slot="footer" class="dialog-footer">
@@ -471,7 +544,9 @@
      tableDataDialog: [],
      title_value: '数据导入 / ç‚¹æ£€éƒ¨ä½',
      code: '4',
      shows: false
      shows: false,
      dialogTableNumberCol: 0, // å¯¹è¯æ¡†åŠ¨æ€çš„列数
      dialogTableArrayCol: []// å¯¹è¯æ¡†åŠ¨æ€çš„数组

    }
  },
@@ -542,10 +617,29 @@

    async check(row) {
      // this.operation = operation

      this.dialogVisible = true
      console.log(row, 1)
      const res = await StepCheckTableSubSearch({ id: row.id })
      this.tableDataDialog = res.data
      this.dialogVisible = true

      this.tableDataDialog.forEach((item, index) => {
        for (const it in item) {
          if (it.indexOf('/') !== -1) {
            const i = it.split('/')[1]
            this.dialogTableNumberCol = i
          }
        }
      })

      this.dialogTableArrayCol = []
      for (let i = 0; i < this.dialogTableNumberCol; i++) {
        this.dialogTableArrayCol.push(i)
      }

      this.$nextTick(() => {
        this.$refs.tableDataRef2.doLayout()
      })
    },

    // æ–°å¢žæŒ‰é’®
@@ -586,11 +680,7 @@
    },
    // å¯¹è¯æ¡†å…³é—­äº‹ä»¶
    handleClose() {
      this.dialogForm.OrgType = ''
      this.dialogForm.OrgCode = ''
      this.dialogForm.OrgName = ''
      this.dialogForm.SupUnit = ''
      this.$refs.dialogForm.clearValidate()
      this.tableDataDialog = []
    },
    // å¯¹è¯æ¡†å–消
    dialogVisibleCancel() {

 src/views/reportManager/logisticsCheck.vue

@@ -341,66 +341,74 @@
          min-width="100"
        >
          <template slot-scope="{row}">

            <!--        ~当三个值都有    -->
            <div v-if="row.standvalue&&row.uppervalue&&row.lowervalue&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">
              <!--            <div v-if="row[(index + 1) + '/' + dialogTableNumberCol]>=row.lowervalue&&row[(index + 1) + '/' + dialogTableNumberCol]<=row.uppervalue">-->
              <div style="display: flex;align-items: center">
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
              </div>
            <div style="display: flex;align-items: center">
              <i
                :class="row.check_result==='OK'?'el-icon-success':'el-icon-error'"
                :style="{color:row.check_result==='OK'?$store.state.settings.theme:'red'}"
                style="margin-right: 2px"
              />
              {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
            </div>

            <!--            ~当只有标准值和上限值时  -->
            <div v-else-if="row.standvalue&&row.uppervalue&&row.lowervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">
              <div style="display: flex;align-items: center">
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
              </div>
            </div>
            <!--            ~当只有标准值和下限值时-->
            <div v-else-if="row.standvalue&&row.lowervalue&&row.uppervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)">
              <div style="display: flex;align-items: center">
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
              </div>
            </div>
            <!--            &lt;!&ndash;        ~当三个值都有    &ndash;&gt;-->
            <!--            <div v-if="row.standvalue&&row.uppervalue&&row.lowervalue&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
            <!--              &lt;!&ndash;            <div v-if="row[(index + 1) + '/' + dialogTableNumberCol]>=row.lowervalue&&row[(index + 1) + '/' + dialogTableNumberCol]<=row.uppervalue">&ndash;&gt;-->
            <!--              <div style="display: flex;align-items: center">-->
            <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
            <!--              </div>-->
            <!--            </div>-->

            <!--            ~当只有上限值和下限值时-->
            <div v-else-if="row.uppervalue&&row.lowervalue&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">
              <div style="display: flex;align-items: center">
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
              </div>
            </div>
            <!--            ~当只有标准值时     -->
            <div v-else-if="row.standvalue&&row.uppervalue===''&&row.lowervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])===parseFloat(row.standvalue)">
              <div style="display: flex;align-items: center">
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
              </div>
            </div>
            <!--            ~当只有上限值时       -->
            <div v-else-if="row.uppervalue&&row.lowervalue===''&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">
              <div style="display: flex;align-items: center">
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
              </div>
            </div>
            <!--            &lt;!&ndash;            ~当只有标准值和上限值时  &ndash;&gt;-->
            <!--            <div v-else-if="row.standvalue&&row.uppervalue&&row.lowervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
            <!--              <div style="display: flex;align-items: center">-->
            <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
            <!--              </div>-->
            <!--            </div>-->
            <!--            &lt;!&ndash;            ~当只有标准值和下限值时&ndash;&gt;-->
            <!--            <div v-else-if="row.standvalue&&row.lowervalue&&row.uppervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)">-->
            <!--              <div style="display: flex;align-items: center">-->
            <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
            <!--              </div>-->
            <!--            </div>-->

            <!--            ~当只有下限值时      -->
            <div v-else-if="row.lowervalue&& row.uppervalue===''&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)">
              <div style="display: flex;align-items: center">
                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
              </div></div>
            <!--            &lt;!&ndash;            ~当只有上限值和下限值时&ndash;&gt;-->
            <!--            <div v-else-if="row.uppervalue&&row.lowervalue&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
            <!--              <div style="display: flex;align-items: center">-->
            <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
            <!--              </div>-->
            <!--            </div>-->
            <!--            &lt;!&ndash;            ~当只有标准值时     &ndash;&gt;-->
            <!--            <div v-else-if="row.standvalue&&row.uppervalue===''&&row.lowervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])===parseFloat(row.standvalue)">-->
            <!--              <div style="display: flex;align-items: center">-->
            <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
            <!--              </div>-->
            <!--            </div>-->
            <!--            &lt;!&ndash;            ~当只有上限值时       &ndash;&gt;-->
            <!--            <div v-else-if="row.uppervalue&&row.lowervalue===''&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
            <!--              <div style="display: flex;align-items: center">-->
            <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
            <!--              </div>-->
            <!--            </div>-->

            <div v-else>
              <div style="display: flex;align-items: center">
                <i class="el-icon-error" style="color: red;margin-right: 2px" />
                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
              </div>
            </div>
            <!--            &lt;!&ndash;            ~当只有下限值时      &ndash;&gt;-->
            <!--            <div v-else-if="row.lowervalue&& row.uppervalue===''&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)">-->
            <!--              <div style="display: flex;align-items: center">-->
            <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
            <!--              </div></div>-->

            <!--            <div v-else>-->
            <!--              <div style="display: flex;align-items: center">-->
            <!--                <i class="el-icon-error" style="color: red;margin-right: 2px" />-->
            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
            <!--              </div>-->
            <!--            </div>-->

          </template>
        </el-table-column>