Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-11-24 2f5861703779dd20fdbd8d61b1d06531d1d80fc3

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 src/api/warehouse/pallettransports.js

@@ -46,6 +46,30 @@
  })
}

export function getPalletTransportsAllDetailDataApi(query) {
  return request({
    url: '/mes/palletTransportsMaterial/detail/click',
    method: 'get',
    params: query
  })
}

export function palletTransportsMaterialFetchListCopy(query) {
  return request({
    url: '/mes/palletTransportsMaterial/page/copy',
    method: 'get',
    params: query
  })
}

export function palletTransportsMaterialListClick(query) {
  return request({
    url: '/mes/palletTransportsMaterial/page/click',
    method: 'get',
    params: query
  })
}

export function addPalletTransportsMaterial(obj) {
  return request({
    url: '/mes/palletTransportsMaterial',
@@ -56,6 +80,14 @@
export function putPalletTransportsMaterial(obj) {
  return request({
    url: '/mes/palletTransportsMaterial',
    method: 'put',
    data: obj
  })
}

export function putPalletTransportsMaterialCopy(obj) {
  return request({
    url: '/mes/palletTransportsMaterial/update',
    method: 'put',
    data: obj
  })
@@ -115,6 +147,14 @@
  })
}

export function updateBatchPalletTransportsCopy(obj) {
  return request({
    url: '/mes/palletTransportsMaterial/updateBatchPalletTransportsCopy',
    method: 'put',
    data: obj
  })
}

export function updateBatchPalletTransportsDetail(obj) {
  return request({
    url: '/mes/palletTransportsDetail/updateBatch',

 src/views/warehouse/pallettransports/detail-ifslocation-form.vue

@@ -23,7 +23,7 @@
      </div>
      <div style="display:flex;align-items:center;margin-left:10px;">
        <div>
          <span>库位描述：</span>
          <span>库位名称：</span>
        </div>
        <div>
          <el-input
@@ -56,25 +56,32 @@
        </template>
      </el-table-column>
      <el-table-column type="index" width="50" label="序号"> </el-table-column>
      <el-table-column prop="locationNo" label="库位号" align="center">
      <el-table-column prop="locNo" label="库位号" align="center">
      </el-table-column>
      <el-table-column
        prop="locationDesc"
        label="库位描述"
        prop="locName"
        label="库位名称"
        align="center"
        show-overflow-tooltip
      >
      </el-table-column>
      <el-table-column
        prop="locationGroupDesc"
        label="库位组描述"
        prop="locType"
        label="库位类型"
        align="center"
        show-overflow-tooltip
      >
      </el-table-column>
      <el-table-column
        prop="locationTypeDesc"
        label="库位类型描述"
        prop="ifsLocation"
        label="ifs库位"
        align="center"
        show-overflow-tooltip
      >
      </el-table-column>
      <el-table-column
        prop="ifsLocationGroup"
        label="ifs库位组"
        align="center"
        show-overflow-tooltip
      >
@@ -92,7 +99,7 @@
  </el-dialog>
</template>
<script>
import { getIfsLocationByGroup } from '@/api/warehouse/location'
import { getIfsLocationByGroupCopyAll } from '@/api/warehouse/location'
import { updateBatchPalletTransportsDetail } from '@/api/warehouse/pallettransports'
export default {
  components: {},
@@ -124,19 +131,20 @@
    // 查询ifs库位列表
    queryLocation() {
      this.ifsLocationData = []
      getIfsLocationByGroup({
      getIfsLocationByGroupCopyAll({
        locationNo: this.dataForm.locationNo,
        locationDesc: this.dataForm.locationDesc
      }).then((response) => {
        if (response.data.code === 0) {
        if (response.data.code == 0) {
          const _data = response.data.data
          this.ifsLocationData = _data.map((item, index) => {
            return {
              id: index + 1,
              locationNo: item.LOCATION_NO,
              locationDesc: item.LOCATION_DESC,
              locationGroupDesc: item.LOCATION_GROUP_DESC,
              locationTypeDesc: item.LOCATION_TYPE_DESC,
              locNo: item.locNo,
              locName: item.locName,
              locType: item.locType,
              ifsLocation: item.ifsLocation,
              ifsLocationGroup: item.ifsLocationGroup,
              commonChecked: false
            }
          })
@@ -168,8 +176,8 @@
      this.detailList.forEach((item) => {
        transportsDetails.push({
          id: item.id,
          toIfsLocationName: this.currLocationRow.locationDesc,
          toIfsLocationNo: this.currLocationRow.locationNo
          toIfsLocationName: this.currLocationRow.locName,
          toIfsLocationNo: this.currLocationRow.locNo
        })
      })
      updateBatchPalletTransportsDetail(transportsDetails)

 src/views/warehouse/pallettransports/ifslocation-form.vue

@@ -23,7 +23,7 @@
      </div>
      <div style="display:flex;align-items:center;margin-left:10px;">
        <div>
          <span>库位描述：</span>
          <span>库位名称：</span>
        </div>
        <div>
          <el-input
@@ -56,29 +56,39 @@
        </template>
      </el-table-column>
      <el-table-column type="index" width="50" label="序号"> </el-table-column>
      <el-table-column prop="locationNo" label="库位号" align="center">
      <el-table-column prop="locNo" label="库位号" align="center">
      </el-table-column>
      <el-table-column
        prop="locationDesc"
        label="库位描述"
        prop="locName"
        label="库位名称"
        align="center"
        show-overflow-tooltip
      >
      </el-table-column>
      <el-table-column
        prop="locationGroupDesc"
        label="库位组描述"
        prop="locType"
        label="库位类型"
        align="center"
        show-overflow-tooltip
      >
      <template scope="scope">
        {{formatLocType(scope.row.locType)}}
      </template>
      </el-table-column>
     <!--  <el-table-column
        prop="ifsLocation"
        label="ifs库位"
        align="center"
        show-overflow-tooltip
      >
      </el-table-column>
      <el-table-column
        prop="locationTypeDesc"
        label="库位类型描述"
        prop="ifsLocationGroup"
        label="ifs库位组"
        align="center"
        show-overflow-tooltip
      >
      </el-table-column>
      </el-table-column> -->
    </el-table>
    <div slot="footer" class="dialog-footer">
      <el-button @click="innerVisible = false">取 消</el-button>
@@ -92,10 +102,12 @@
  </el-dialog>
</template>
<script>
import { getIfsLocationByGroup } from '@/api/warehouse/location'
import { getIfsLocationByGroupCopyAll } from '@/api/warehouse/location'
import { updateBatchPalletTransportsMaterial } from '@/api/warehouse/pallettransports'
import Template from '../../quality/parts/template.vue'
import { remote } from '../../../api/admin/dict'
export default {
  components: {},
  components: {Template},
  props: {
    currshowlist: {
      type: Boolean,
@@ -108,39 +120,66 @@
      }
    }
  },
  filters:{
    
  },
  data() {
    return {
      innerVisible: false,
      locTypeOption: [],
      isSubmit: false,
      dataForm: {
        locationNo: null,
        locationDesc: null
        locationNo: '',
        locationDesc: ''
      },
      ifsLocationData: [],
      currLocationRow: null
    }
  },
  created() {
    this.getLoc()
  },
  methods: {
    formatLocType(val){
      let list = this.locTypeOption
      console.log(val,list)
      list.forEach(ele=>{
        console.log(Number(ele.value) == Number(val));
        if(Number(ele.value) == Number(val)){
          return ele.label
        }
      })
    },
    // 查询ifs库位列表
    queryLocation() {
      this.ifsLocationData = []
      getIfsLocationByGroup({
      getIfsLocationByGroupCopyAll({
        locationNo: this.dataForm.locationNo,
        locationDesc: this.dataForm.locationDesc
      }).then((response) => {
        if (response.data.code === 0) {
        if (response.data.code == 0) {
          const _data = response.data.data
          this.ifsLocationData = _data.map((item, index) => {
            return {
              id: index + 1,
              locationNo: item.LOCATION_NO,
              locationDesc: item.LOCATION_DESC,
              locationGroupDesc: item.LOCATION_GROUP_DESC,
              locationTypeDesc: item.LOCATION_TYPE_DESC,
              locNo: item.locNo,
              locName: item.locName,
              locType: item.locType,
              ifsLocation: item.ifsLocation,
              ifsLocationGroup: item.ifsLocationGroup,
              commonChecked: false
            }
          })
        }
      })
    },
    // 获取库位类型的数据字典
    getLoc() {
      remote('warehouse_type').then((response) => {
        if (response.data.code === 0) {
          this.locTypeOption = response.data.data
        }
        console.log(response);
      })
    },
    // 单行选中
@@ -165,11 +204,12 @@
    saveSelectRow() {
      this.isSubmit = true
      const transportsMaterials = []
      console.log(`output->this.transportsList`,this.transportsList)
      this.transportsList.forEach((item) => {
        transportsMaterials.push({
          id: item.id,
          toIfsLocationName: this.currLocationRow.locationDesc,
          toIfsLocationNo: this.currLocationRow.locationNo
          toIfsLocationName: this.currLocationRow.locName,
          toIfsLocationNo: this.currLocationRow.locNo
        })
      })
      updateBatchPalletTransportsMaterial(transportsMaterials)

 src/views/warehouse/pallettransports/ifsstock-form.vue

@@ -1,93 +1,34 @@
<template>
  <el-dialog
    width="65%"
    title="IFS库存物料"
    top="5vh"
    :visible.sync="innerVisible"
    append-to-body
    @close="$emit('update:currshowlist', false)"
    :show="currshowlist"
    class="part-dialog"
  >
  <el-dialog width="65%" title="IFS库存物料" top="5vh" :visible.sync="innerVisible" append-to-body
    @close="$emit('update:currshowlist', false)" :show="currshowlist" class="part-dialog">
    <div>
      <span>需求数量：</span
      ><span style="color:Red;">{{
      <span>需求数量：</span><span style="color:Red;">{{
        materialRow == null
          ? ''
          : materialRow.surplusQuantity - totalPlanMoveQuality
        ? ''
        : materialRow.surplusQuantity - totalPlanMoveQuality
      }}</span>
    </div>
    <el-table
      class="ifs-stock-table"
      :data="ifsStockData"
      style="width: 100%;"
      height="450px"
      border
      @selection-change="ifsStockSelectionChange"
      stripe
      ref="ifsStockTable"
    >
    <el-table class="ifs-stock-table" :data="ifsStockData" style="width: 100%;" height="450px" border
      @selection-change="ifsStockSelectionChange" stripe ref="ifsStockTables">
      <el-table-column type="selection" width="55"> </el-table-column>
      <el-table-column type="index" width="50" label="序号"> </el-table-column>
      <el-table-column
        prop="partNo"
        label="零件号"
        align="center"
        show-overflow-tooltip
      >
      <el-table-column prop="partNo" label="零件号" align="center" show-overflow-tooltip>
      </el-table-column>
      <el-table-column
        prop="partDesc"
        label="零件描述"
        align="center"
        show-overflow-tooltip
      >
      <el-table-column prop="partDesc" label="零件描述" align="center" show-overflow-tooltip>
      </el-table-column>
      <el-table-column
        prop="locationDesc"
        label="库位"
        align="center"
        show-overflow-tooltip
      >
      <el-table-column prop="locationDesc" label="库位" align="center" show-overflow-tooltip>
      </el-table-column>
      <el-table-column
        prop="batchNo"
        label="批次号"
        align="center"
        show-overflow-tooltip
      >
      <el-table-column prop="batchNo" label="批次号" align="center" show-overflow-tooltip>
      </el-table-column>
      <el-table-column
        prop="wdr"
        label="WDR"
        align="center"
        show-overflow-tooltip
      >
      <el-table-column prop="wdr" label="WDR" align="center" show-overflow-tooltip>
      </el-table-column>
      <el-table-column
        prop="optaskNo"
        label="工单"
        align="center"
        show-overflow-tooltip
      >
      <el-table-column prop="optaskNo" label="工单" align="center" show-overflow-tooltip>
      </el-table-column>
      <el-table-column
        prop="available"
        label="可用库存数量"
        align="center"
        show-overflow-tooltip
      >
      <el-table-column prop="available" label="可用库存数量" align="center" show-overflow-tooltip>
      </el-table-column>
      <el-table-column
        prop="planMoveQuality"
        label="计划移库数量"
        align="center"
      >
      <el-table-column prop="planMoveQuality" label="计划移库数量" align="center">
        <template slot-scope="scope">
          <el-input
            v-model="scope.row.planMoveQuality"
            @blur="blurChangeCallback(scope.row)"
          ></el-input>
          <el-input v-model="scope.row.planMoveQuality" @blur="blurChangeCallback(scope.row)"></el-input>
        </template>
      </el-table-column>
      <el-table-column prop="unit" label="单位" align="center">
@@ -97,12 +38,7 @@
    </el-table>
    <div slot="footer" class="dialog-footer">
      <el-button @click="innerVisible = false">取 消</el-button>
      <el-button
        type="primary"
        :disabled="isSubmit"
        v-thinclick="`saveSelectRow`"
        >确 定</el-button
      >
      <el-button type="primary" v-thinclick="`saveSelectRow`">确 定</el-button>
    </div>
  </el-dialog>
</template>
@@ -177,18 +113,18 @@
                flagMsg =
                  flagMsg + '第' + (i + 1) + '行，计划移库数量最多六位小数；'
              } else {
                console.log(
                  'this.ifsStockData[i].planMoveQuality',
                  this.ifsStockData[i].planMoveQuality
                )
                console.log(
                  'this.ifsStockData[i].available',
                  this.ifsStockData[i].available
                )
                console.log(
                  this.ifsStockData[i].planMoveQuality >
                    this.ifsStockData[i].available
                )
                // console.log(
                //   'this.ifsStockData[i].planMoveQuality',
                //   this.ifsStockData[i].planMoveQuality
                // )
                // console.log(
                //   'this.ifsStockData[i].available',
                //   this.ifsStockData[i].available
                // )
                // console.log(
                //   this.ifsStockData[i].planMoveQuality >
                //   this.ifsStockData[i].available
                // )
                if (
                  this.ifsStockData[i].planMoveQuality >
                  this.ifsStockData[i].available
@@ -262,9 +198,16 @@
            partDesc: item.partDesc,
            batchNo: item.batchNo,
            wdr: item.wdr,
            serialNo: item.serialNo,
            engChgLevel: item.engChgLevel,
            configurationId: item.configurationId,
            activitySeq: item.activitySeq,
            transferQuantity: item.planMoveQuality,
            fromIfsLocationNo: item.locationNo,
            transportsMaterialId: this.materialRow.id,
            toIfsLocationNo: this.materialRow.toIfsLocationNo,
            toIfsLocationName: this.materialRow.toIfsLocationName,
            partId: this.materialRow.partId,
            transportsId: this.transportsRow.id,
            operationTaskId: item.optaskId,
            operationTaskNo: item.optaskNo,
@@ -282,10 +225,10 @@
              } else {
                this.$message.error('添加移库明细失败')
              }
              this.isSubmit = false
              this.isSubmit = true
            })
            .catch(() => {
              this.isSubmit = false
              this.isSubmit = true
            })
        } else {
          this.$message.error('请选择IFS库存物料')
@@ -295,7 +238,7 @@
        this.isSubmit = false
      }
    },
    initData() {}
    initData() { }
  },
  watch: {
    currshowlist() {
@@ -318,14 +261,18 @@
                    id: index + 1,
                    partNo: item.PART_NO,
                    partDesc: item.PART_DESC,
                    locationDesc: item.LOCATION_DESC,
                    locationDesc: item.LOCATION_NO,
                    locationNo: item.LOCATION_NO,
                    batchNo: item.LOT_BATCH_NO,
                    wdr: item.WAIV_DEV_REJ_NO,
                    available: Number(item.QTY_AVAILABLE),
                    unit: item.UNIT_MEAS_DESC,
                    engChgLevel: item.ENG_CHG_LEVEL,
                    serialNo: item.SERIAL_NO,
                    configurationId: item.CONFIGURATION_ID,
                    activitySeq: item.ACTIVITY_SEQ,
                    planMoveQuality: Number(item.QTY_AVAILABLE),
                    partId: this.materialRow.partId,
                    optaskNo: this.optask != null ? this.optask.optaskNo : null,
                    optaskId: this.optask != null ? this.optask.id : null
                  })
@@ -333,6 +280,7 @@
              }
            }
          })
          console.log(`output->this.ifsStockData`,this.ifsStockData)
        })
      }
    }
@@ -343,9 +291,11 @@
.part-dialog .el-dialog__header {
  padding: 10px 20px 10px;
}

.part-dialog .el-dialog__header .el-dialog__headerbtn {
  top: 10px;
}

.part-dialog .el-dialog__body {
  padding: 5px 20px;
}

 src/views/warehouse/pallettransports/index.vue

@@ -3,321 +3,142 @@
    <basic-container>
      <el-row>
        <el-col :span="9">
          <ttable
            :table="table"
            @currentChange="palletTransportsChange"
            :uploadInfo="uploadInfo"
            :prelang="prelang"
            :options="options"
            :ajaxFun="ajaxFun"
            :fixedHeight="palletTransportsFixedHeight"
            ref="pallettransportsTable"
          >
          <ttable :table="table" @currentChange="palletTransportsChange" :uploadInfo="uploadInfo" :prelang="prelang"
            :options="options" :ajaxFun="ajaxFun" :fixedHeight="palletTransportsFixedHeight" ref="pallettransportsTable">
            <template #toolbar>
              <el-button
                v-if="permissions.warehouse_pallettransports_add"
                type="primary"
                @click="addOrUpdateHandle()"
                >新增</el-button
              >
              <el-button v-if="permissions.warehouse_pallettransports_add" type="primary"
                @click="addOrUpdateHandle()">新增</el-button>
            </template>
          </ttable>
          <div
            style="margin:0px 20px 0px;display:flex;height:36px;justify-content: space-between;align-items:center;"
          >
          <div style="margin:0px 20px 0px;display:flex;height:36px;justify-content: space-between;align-items:center;">
            <div>
              <span style="font-weight:bold;">对应工单</span>
            </div>
            <div></div>
          </div>
          <div style="padding:0px 20px 0px;">
            <el-table
              class="pallet-transports-optask-table"
              :data="palletTransportsOptaskData"
              style="width: 100%;"
              v-adaptive="{ bottomOffset: 20, fixedHeight: 0 }"
              height="100px"
              border
              highlight-current-row
              @row-click="optaskRowClick"
              stripe
              ref="palletTransportsOptaskTable"
            >
            <el-table class="pallet-transports-optask-table" :data="palletTransportsOptaskData" style="width: 100%;"
              v-adaptive="{ bottomOffset: 20, fixedHeight: 0 }" height="100px" border highlight-current-row
              @row-click="optaskRowClick" stripe ref="palletTransportsOptaskTable">
              <el-table-column align="center" width="55" label="单选">
                <template slot-scope="scope">
                  <el-checkbox
                    class="optask-table-single-checkbox"
                    v-model="scope.row.commonChecked"
                    disabled
                  ></el-checkbox>
                  <el-checkbox class="optask-table-single-checkbox" v-model="scope.row.commonChecked"
                    disabled></el-checkbox>
                </template>
              </el-table-column>
              <el-table-column
                prop="optaskNo"
                label="工单号"
                align="center"
                show-overflow-tooltip
              >
              <el-table-column prop="optaskNo" label="工单号" align="center" show-overflow-tooltip>
              </el-table-column>
              <el-table-column
                prop="partName"
                label="零件"
                align="center"
                show-overflow-tooltip
              >
              <el-table-column prop="partName" label="零件" align="center" show-overflow-tooltip>
              </el-table-column>
              <el-table-column
                prop="workCenter"
                label="工作中心"
                align="center"
                show-overflow-tooltip
              >
              <el-table-column prop="workCenter" label="工作中心" align="center" show-overflow-tooltip>
              </el-table-column>
              <el-table-column
                prop="workstationName"
                label="工作站"
                align="center"
                show-overflow-tooltip
              >
              <el-table-column prop="workstationName" label="工作站" align="center" show-overflow-tooltip>
              </el-table-column>
              <el-table-column
                prop="plannedQuantity"
                label="计划数量"
                align="center"
                show-overflow-tooltip
              >
              <el-table-column prop="plannedQuantity" label="计划数量" align="center" show-overflow-tooltip>
              </el-table-column>
              <el-table-column
                prop="unit"
                label="单位"
                align="center"
                show-overflow-tooltip
              >
              <el-table-column prop="unit" label="单位" align="center" show-overflow-tooltip>
              </el-table-column>
            </el-table>
          </div>
        </el-col>
        <el-col :span="15" style="padding-left: 10px;padding-right: 10px">
          <div
            style="display:flex;height:36px;justify-content: space-between;align-items:center;"
          >
          <div style="display:flex;height:36px;justify-content: space-between;align-items:center;">
            <div><span style="font-weight:bold;">物料需求</span></div>
            <div>
              <el-button
                type="text"
                v-if="permissions.warehouse_pallettransports_demand_add"
                @click="openPartDialog"
                >新增</el-button
              ><el-button
                type="text"
                v-if="permissions.warehouse_pallettransports_ifs"
                @click="openLocationDialog"
                >IFS至库位</el-button
              >
              <el-button type="text" v-if="permissions.warehouse_pallettransports_demand_add"
                @click="openPartDialog">新增</el-button><el-button type="text"
                v-if="permissions.warehouse_pallettransports_ifs" @click="openLocationDialog">移至库位</el-button>
            </div>
          </div>
          <div>
            <el-table
              class="pallet-transports-material-table"
              :data="palletTransportsMaterialData"
              style="width: 100%;"
              height="350px"
              border
              @selection-change="palletTransportsMaterialSelectionChange"
              stripe
              ref="palletTransportsMaterialTable"
            >
            <el-table class="pallet-transports-material-table" :data="palletTransportsMaterialData" style="width: 100%;"
              height="350px" border @selection-change="palletTransportsMaterialSelectionChange" stripe
              ref="palletTransportsMaterialTable">
              <el-table-column type="selection" width="55"> </el-table-column>
              <el-table-column
                prop="partNo"
                label="零件号"
                align="center"
                show-overflow-tooltip
              >
              <el-table-column prop="partNo" label="零件号" align="center" show-overflow-tooltip>
              </el-table-column>
              <el-table-column
                prop="partDesc"
                label="零件描述"
                align="center"
                show-overflow-tooltip
              >
              <el-table-column prop="partDesc" label="零件描述" align="center" show-overflow-tooltip>
              </el-table-column>
              <el-table-column
                prop="demandQuantity"
                label="需求数量"
                align="center"
              >
              <el-table-column prop="demandQuantity" label="需求数量" align="center">
                <template slot-scope="scope">
                  <el-input
                    v-show="scope.row.canEdit"
                    v-model="scope.row.demandQuantity"
                  ></el-input>
                  <el-input v-show="scope.row.canEdit" v-model="scope.row.demandQuantity"></el-input>
                  <span v-show="!scope.row.canEdit">{{
                    scope.row.demandQuantity
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column
                prop="transferQuantity"
                label="移库数量"
                align="center"
              >
              <el-table-column prop="transferQuantity" label="移库数量" align="center">
              </el-table-column>
              <el-table-column
                prop="surplusQuantity"
                label="剩余数量"
                align="center"
              >
              <el-table-column prop="surplusQuantity" label="剩余数量" align="center">
              </el-table-column>
              <el-table-column prop="unit" label="计量单位" align="center">
              </el-table-column>
              <el-table-column
                prop="toIfsLocationNo"
                label="IFS至库位"
                align="center"
              >
              <el-table-column prop="toIfsLocationNo" label="移至库位" align="center">
              </el-table-column>
              <el-table-column label="操作" align="center" width="100">
                <template slot-scope="scope">
                  <el-button
                    v-show="!scope.row.canEdit"
                    type="text"
                    :disabled="scope.row.detailExistState"
                    @click="scope.row.canEdit = true"
                    >编辑</el-button
                  >
                  <el-button
                    v-show="scope.row.canEdit"
                    type="text"
                    :disabled="scope.row.detailExistState"
                    @click="updateMaterial(scope.row)"
                    >保存</el-button
                  >
                  <el-button
                    type="text"
                    :disabled="scope.row.detailExistState"
                    @click="delMaterial(scope.row)"
                    >删除</el-button
                  >
                  <el-button v-show="!scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
                    @click="scope.row.canEdit = true">编辑</el-button>
                  <el-button v-show="scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
                    @click="updateMaterial(scope.row)">保存</el-button>
                  <el-button type="text" :disabled="scope.row.detailExistState"
                    @click="delMaterial(scope.row)">删除</el-button>
                </template>
              </el-table-column>
            </el-table>
          </div>
          <div
            style="margin-top:10px;display:flex;height:36px;justify-content: space-between;align-items:center;"
          >
          <div style="margin-top:10px;display:flex;height:36px;justify-content: space-between;align-items:center;">
            <div>
              <span style="font-weight:bold;">移库明细</span
              ><span style="color:red;"
                >({{
                  palletTransportsMaterialMultipleSelection.length > 0
                    ? palletTransportsMaterialMultipleSelection[
                        palletTransportsMaterialMultipleSelection.length - 1
                      ].partDesc
                    : ''
                }})</span
              >
              <span style="font-weight:bold;">移库明细</span><span style="color:red;">({{
                palletTransportsMaterialMultipleSelection.length > 0
                ? palletTransportsMaterialMultipleSelection[
                  palletTransportsMaterialMultipleSelection.length - 1
                ].partDesc
                : ''
              }})</span>
            </div>
            <div>
              <el-button
                type="primary"
                v-if="permissions.warehouse_pallettransports_detail_add"
                round
                @click="openStockDialog"
                >添加明细</el-button
              >
              <el-button
                type="warning"
                v-if="permissions.warehouse_pallettransports_detail_library"
                round
                @click="openDetailLocationDialog"
                >一键至库位</el-button
              >
              <el-button
                type="success"
                v-if="permissions.warehouse_pallettransports_detail_execute"
                round
                @click="executeMove"
                >执 行</el-button
              >
              <el-button type="primary" v-if="permissions.warehouse_pallettransports_detail_add" round
                @click="openStockDialog">添加明细</el-button>
              <!-- <el-button type="warning" v-if="permissions.warehouse_pallettransports_detail_library" round
                @click="openDetailLocationDialog">一键至库位</el-button> -->
              <el-button type="success" v-if="permissions.warehouse_pallettransports_detail_execute" round
                @click="executeMove">执 行</el-button>
            </div>
          </div>
          <div>
            <el-table
              class="pallet-transports-detail-table"
              :data="palletTransportsDetailData"
              style="width: 100%;"
              v-adaptive="{ bottomOffset: 20, fixedHeight: 0 }"
              height="100px"
              border
              @selection-change="palletTransportsDetailSelectionChange"
              stripe
              ref="palletTransportsDetailTable"
            >
            <el-table class="pallet-transports-detail-table" :data="palletTransportsDetailData" style="width: 100%;"
              v-adaptive="{ bottomOffset: 20, fixedHeight: 0 }" height="100px" border
              @selection-change="palletTransportsDetailSelectionChange" stripe ref="palletTransportsDetailTable">
              <el-table-column type="selection" width="55"> </el-table-column>
              <el-table-column
                prop="partNo"
                label="零件号"
                align="center"
                show-overflow-tooltip
              >
              <el-table-column prop="partNo" label="零件号" align="center" show-overflow-tooltip>
              </el-table-column>
              <el-table-column
                prop="partDesc"
                label="零件描述"
                align="center"
                show-overflow-tooltip
              >
              <el-table-column prop="partDesc" label="零件描述" align="center" show-overflow-tooltip>
              </el-table-column>
              <el-table-column
                prop="batchNo"
                label="批次号"
                align="center"
                show-overflow-tooltip
              >
              <el-table-column prop="batchNo" label="批次号" align="center" show-overflow-tooltip>
              </el-table-column>
              <el-table-column prop="wdr" label="WDR" align="center">
              </el-table-column>
              <el-table-column
                prop="operationTaskNo"
                label="工单"
                align="center"
                show-overflow-tooltip
              >
              <el-table-column prop="operationTaskNo" label="工单" align="center" show-overflow-tooltip>
              </el-table-column>
              <el-table-column
                prop="transferQuantity"
                label="移库数量"
                align="center"
              >
              <el-table-column prop="transferQuantity" label="移库数量" align="center">
              </el-table-column>
              <el-table-column prop="unit" label="单位" align="center">
              </el-table-column>
              <el-table-column
                prop="fromIfsLocationNo"
                label="IFS从库位"
                align="center"
              >
              <el-table-column prop="fromIfsLocationNo" label="IFS从库位" align="center">
              </el-table-column>
              <el-table-column
                prop="toIfsLocationNo"
                label="IFS至库位"
                align="center"
              >
              <el-table-column prop="toIfsLocationNo" label="移至库位" align="center">
                <template slot-scope="scope">
                  <el-link
                    type="primary"
                    @click="openSingleLocationDialog(scope.row)"
                    >{{ scope.row.toIfsLocationNo }}</el-link
                  >
                  <el-link type="primary" @click="openSingleLocationDialog(scope.row)">{{ scope.row.toIfsLocationNo
                  }}</el-link>
                </template>
              </el-table-column>
              <el-table-column prop="state" label="状态" align="center">
                <template slot-scope="scope">
                  <span>{{
                    scope.row.state == null
                      ? ''
                      : scope.row.state === '01initial'
                    ? ''
                    : scope.row.state === '01initial'
                      ? '已创建'
                      : '已执行'
                  }}</span>
@@ -325,18 +146,10 @@
              </el-table-column>
              <el-table-column label="操作" align="center" width="85">
                <template slot-scope="scope">
                  <el-button
                    type="text"
                    @click="openEditStockDialog(scope.row)"
                    :disabled="scope.row.state === '01initial' ? false : true"
                    >编辑</el-button
                  >
                  <el-button
                    type="text"
                    @click="delDetail(scope.row)"
                    :disabled="scope.row.state === '01initial' ? false : true"
                    >删除</el-button
                  >
                  <el-button type="text" @click="openEditStockDialog(scope.row)"
                    :disabled="scope.row.state === '01initial' ? false : true">编辑</el-button>
                  <el-button type="text" @click="delDetail(scope.row)"
                    :disabled="scope.row.state === '01initial' ? false : true">删除</el-button>
                </template>
              </el-table-column>
            </el-table>
@@ -344,44 +157,22 @@
        </el-col>
      </el-row>
      <!-- 弹窗, 新增 / 修改 -->
      <pallettransportsFormDialog
        :currshowlist.sync="showPallettransportsForm"
        :palletTransportsId="palletTransportsId"
        @refreshPalletTransports="getPallettransportsData"
      />
      <pallettransportsFormDialog :currshowlist.sync="showPallettransportsForm" :palletTransportsId="palletTransportsId"
        @refreshPalletTransports="getPallettransportsData" />
      <!-- 弹窗, 零件列表 -->
      <partDialog
        :currshowlist.sync="showPart"
        @listenToPartEvent="selectPartCallback"
      />
      <partDialog :currshowlist.sync="showPart" @listenToPartEvent="selectPartCallback" />
      <!-- 弹窗, IFS库位列表 -->
      <ifsLocationDialog
        :currshowlist.sync="showLocation"
        :transportsList="palletTransportsMaterialMultipleSelection"
        @refreshDataList="selectLocationCallback"
      />
      <ifsLocationDialog :currshowlist.sync="showLocation" :transportsList="palletTransportsMaterialMultipleSelection"
        @refreshDataList="selectLocationCallback" />
      <!-- 弹窗, IFS库存列表 -->
      <ifsStockDialog
        :currshowlist.sync="showStock"
        :materialRow="materialRow"
        :transportsRow="currPalletTransportsRow"
        :optask="currOptask"
        @refreshDataList="addIfsStockCallback"
      />
      <ifsStockDialog :currshowlist.sync="showStock" :materialRow="materialRow" :transportsRow="currPalletTransportsRow"
        :optask="currOptask" @refreshDataList="addIfsStockCallback" />
      <!-- 弹窗, 编辑IFS库存列表 -->
      <detailIfsStockDialog
        :currshowlist.sync="showDetailStock"
        :materialRow="materialRow"
        :transportsRow="currPalletTransportsRow"
        :detailRow="currDetailRow"
        @refreshDataList="addIfsStockCallback"
      />
      <detailIfsStockDialog :currshowlist.sync="showDetailStock" :materialRow="materialRow"
        :transportsRow="currPalletTransportsRow" :detailRow="currDetailRow" @refreshDataList="addIfsStockCallback" />
      <!-- 弹窗, 明细的IFS库位列表 -->
      <detailIfsLocationDialog
        :currshowlist.sync="showDetailLocation"
        :detailList="detailList"
        @refreshDataList="selectDetailLocationCallback"
      />
      <detailIfsLocationDialog :currshowlist.sync="showDetailLocation" :detailList="detailList"
        @refreshDataList="selectDetailLocationCallback" />
    </basic-container>
  </div>
</template>
@@ -552,7 +343,7 @@
  computed: {
    ...mapGetters(['permissions'])
  },
  created() {},
  created() { },
  methods: {
    // 工艺类型中文格式化
    formatStateType(row, column, cellValue) {
@@ -666,7 +457,7 @@
        closeOnClickModal: false,
        type: 'warning'
      })
        .then(function() {
        .then(function () {
          return delPalletTransportsObj(row.id)
        })
        .then((data) => {
@@ -675,7 +466,7 @@
          this.palletTransportsMaterialData = []
          this.palletTransportsDetailData = []
        })
        .catch(() => {})
        .catch(() => { })
    },
    // 打开零件列表
    openPartDialog() {
@@ -951,57 +742,59 @@
}
</script>
<style scoped>
.pallet-transports-material-table >>> .el-table__header th {
.pallet-transports-material-table>>>.el-table__header th {
  color: #666666;
}

.pallet-transports-material-table >>> th {
.pallet-transports-material-table>>>th {
  padding: 3px 0px;
  height: 31px;
}
.pallet-transports-material-table >>> td {

.pallet-transports-material-table>>>td {
  padding: 1px 0 0 0;
}

.pallet-transports-detail-table >>> .el-table__header th {
.pallet-transports-detail-table>>>.el-table__header th {
  color: #666666;
}

.pallet-transports-detail-table >>> th {
.pallet-transports-detail-table>>>th {
  padding: 3px 0px;
  height: 31px;
}
.pallet-transports-detail-table >>> td {

.pallet-transports-detail-table>>>td {
  padding: 1px 0 0 0;
}

.pallet-transports-optask-table >>> .el-table__header th {
.pallet-transports-optask-table>>>.el-table__header th {
  color: #666666;
}

.pallet-transports-optask-table >>> th {
.pallet-transports-optask-table>>>th {
  padding: 3px 0px;
  height: 31px;
}
.pallet-transports-optask-table >>> td {

.pallet-transports-optask-table>>>td {
  padding: 1px 0 0 0;
}
.optask-table-single-checkbox
  >>> .el-checkbox__input.is-disabled.is-checked
  .el-checkbox__inner {

.optask-table-single-checkbox>>>.el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
  background-color: #006eff;
  border-color: #006eff;
}
.optask-table-single-checkbox
  >>> .el-checkbox__input.is-disabled
  .el-checkbox__inner {

.optask-table-single-checkbox>>>.el-checkbox__input.is-disabled .el-checkbox__inner {
  background-color: #ffffff;
  cursor: pointer;
}
.optask-table-single-checkbox >>> .el-checkbox__inner::after {

.optask-table-single-checkbox>>>.el-checkbox__inner::after {
  border: 1px solid #fff !important;
  border-left: 0 !important;
  border-top: 0 !important;
  cursor: pointer !important;
}
</style>
</style>