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

zouyu

2023-11-24 87ee25bcc236b70b0d22b2ff121f9552959d4873

 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)