modified: src/api/warehouse/pallettransports.js modified: src/views/w...

王震

2023-12-29 39607cc49e13f4d69d2d1ddf69f8e769eea714bc

 src/views/warehouse/pallettransports/index.vue

@@ -3,13 +3,27 @@
    <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">
            <template #toolbar>
              <el-button v-if="permissions.warehouse_pallettransports_add" type="primary"
                @click="addOrUpdateHandle()">新增</el-button>
                <el-dropdown style="margin-left: 20px;" @command="handleCommand">
                    <el-button >
                      状态变更<i class="el-icon-arrow-down el-icon--right"></i>
                    </el-button>
                    <el-dropdown-menu slot="dropdown">
                      <el-dropdown-item :key="index" 
                        :command="item.label"
                        v-for="(item,index) in taskTypeArr" 
                        >{{ item.label }}</el-dropdown-item
                      >
                    </el-dropdown-menu>
                </el-dropdown>
            </template>
          </ttable>

          <div style="margin:0px 20px 0px;display:flex;height:36px;justify-content: space-between;align-items:center;">
            <div>
              <span style="font-weight:bold;">对应工单</span>
@@ -52,15 +66,16 @@
            </div>
          </div>
          <div>
            <el-table class="pallet-transports-material-table" :data="palletTransportsMaterialData" @current-change="handleCurrentChange" style="width: 100%;"
              height="350px" border @selection-change="palletTransportsMaterialSelectionChange" stripe
            <el-table class="pallet-transports-material-table" @selection-change="handleCurrentChange"  :data="palletTransportsMaterialData" style="width: 100%;"
              height="350px" border  stripe
              ref="palletTransportsMaterialTable">
                          <!--单选框-->
                  <el-table-column align="center"  label="单选">
                     <template slot-scope="scope">
                        <el-checkbox class="table-single-checkbox" v-model="scope.row.commonChecked"></el-checkbox>
                     </template>
                  </el-table-column>
                          <!--单选框 @selection-change="palletTransportsMaterialSelectionChange"-->
                  <!-- <el-table-column align="center"  width="55" label="多选">
                       <template slot-scope="scope">
                          <el-checkbox v-model="scope.row.commonChecked" @change="handleCurrentChange(scope.row)" ></el-checkbox>
                       </template>
                  </el-table-column> -->
              <el-table-column type="selection" width="55"> </el-table-column>
              <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>
@@ -81,7 +96,7 @@
              </el-table-column>
              <el-table-column prop="toIfsLocationNo" label="移至库位" align="center">
              </el-table-column>
              <el-table-column label="操作" align="center" width="100">
              <el-table-column label="操作" align="center" width="100" v-if="permissions.warehouse_pallettransports_demand_edit">
                <template slot-scope="scope">
                  <!-- <el-button v-show="!scope.row.canEdit" type="text" :disabled="scope.row.detailExistState"
                    @click="scope.row.canEdit = true">编辑</el-button> -->
@@ -96,13 +111,13 @@
          <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;">({{
              <!-- <span style="color:red;">({{
                palletTransportsMaterialMultipleSelection.length > 0
                ? palletTransportsMaterialMultipleSelection[
                  palletTransportsMaterialMultipleSelection.length - 1
                ].partDesc
                : ''
              }})</span>
              }})</span> -->
            </div>
            <div>
              <el-button type="primary" v-if="permissions.warehouse_pallettransports_detail_add" round
@@ -110,7 +125,7 @@
              <!-- <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>
                @click="updateStockFun">执 行</el-button>
            </div>
          </div>
          <div>
@@ -118,6 +133,7 @@
              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="part_no" label="零件号" align="center" show-overflow-tooltip>
              </el-table-column>
              <el-table-column prop="part_desc" label="零件描述" align="center" show-overflow-tooltip>
@@ -128,8 +144,15 @@
              </el-table-column> -->
              <el-table-column prop="operation_task_no" label="工单" align="center" show-overflow-tooltip>
              </el-table-column>

              
              <el-table-column prop="transfer_quantity" label="移库数量" align="center">
                <template slot-scope="scope">
                  <el-input v-model="scope.row.transfer_quantity" @change="moveLocation(scope.row)" :disabled = "scope.row.state == '02submitted' "  border="none"></el-input>
                </template>
              </el-table-column>


              <el-table-column prop="unit" label="单位" align="center">
              </el-table-column>
              <!-- <el-table-column prop="fromIfsLocationNo" label="IFS从库位" align="center">
@@ -151,7 +174,7 @@
                  }}</span>
                </template>
              </el-table-column>
              <el-table-column label="操作" align="center" width="85">
              <el-table-column label="操作" align="center" width="85" v-if="permissions.warehouse_pallettransports_detail_edit">
                <template slot-scope="scope">
                  <!-- <el-button type="text" @click="openEditStockDialog(scope.row)"
                    :disabled="scope.row.state === '01initial' ? false : true">编辑</el-button> -->
@@ -180,6 +203,7 @@
      <!-- 弹窗, 明细的IFS库位列表 -->
      <detailIfsLocationDialog :currshowlist.sync="showDetailLocation" :detailList="detailList"
        @refreshDataList="selectDetailLocationCallback" />
        
    </basic-container>
  </div>
</template>
@@ -195,6 +219,8 @@
  delPalletTransportsDetailObj,
  executeMoveLocation,
  selectAll,
  updateStock,
  updataStatus,
} from '@/api/warehouse/pallettransports'
import { getByPalletTransId } from '@/api/plan/operationtask'
import ttable from '@/views/common/ztt-table.vue'
@@ -210,6 +236,13 @@
export default {
  data() {
    return {
      taskTypeArr: [
        {label:"草稿"},
        {label:"进行中"},
        {label:"已完成"},
    ],
    command:"",
      forbidden:false,
      partDesc: null,
      ajaxFun: palletTransportsFetchList,
      currPalletTransportsRow: null,
@@ -303,14 +336,7 @@
          }
        ],
        toolbar: [],
        operator: [
          {
            text: '删除',
            type: 'text',
            size: 'small',
            fun: this.deleteHandle
          }
        ],
        operator: null,
        operatorConfig: {
          fixed: 'right',
          label: '操作',
@@ -332,6 +358,7 @@
      detailList: [],
      palletTransportsOptaskData: [],
      currOptask: null,
      cid:null,
      stateOptions: [
        { value: 'draft', label: '草稿' },
        { value: 'processing', label: '进行中' },
@@ -355,28 +382,124 @@
    ...mapGetters(['permissions'])
  },
  watch:{
    palletTransportsMaterialMultipleSelection(newVal){
      if(newVal.length>0){
        this.palletTransportsMaterialSelectionChange(newVal)
      }else{
        this.palletTransportsDetailData = []
      }
    // palletTransportsMaterialMultipleSelection(newVal){
    //   if(newVal.length>0){
    //     this.palletTransportsMaterialSelectionChange(newVal)
    //   }else{
    //     this.palletTransportsDetailData = []
    //   }
    // }
    // palletTransportsChange(val){
    //   console.log("=====");
    //   if(val){
    //       console.log(val);
    //       console.log(this.command,"11111")
    //   }else{
    //     console.log("--");
    //   }
    // }
    command: {
      handler(newVal) {
        if (newVal != '') {
          // 当 aa 为空字符串时触发的操作
          console.log('aa is now empty');
        }
      },
    }
  },
  created() { },
  created() {
     if(this.permissions.warehouse_pallettransports_edit){
        this.table.operator = [
          {
            text: '删除',
            type: 'text',
            size: 'small',
            fun: this.deleteHandle
          }
        ]
     }
   },
  methods: {
           // 单行选中
      handleCurrentChange(row) {
            if (row != null) {
               this.palletTransportsMaterialData.forEach((item) => {
                  // 排他,每次选择时把其他选项都清除
                  if (item.id !== row.id) {
                     item.commonChecked = false
                  } else {
                     item.commonChecked = true
                  }
               })
            }
    palletTransportsChange(val) {
      this.cid = val.id
      this.currPalletTransportsRow = val
      if (this.currPalletTransportsRow) {
        this.getPalletTransportsMaterialData()
        this.getOptasks()
        this.palletTransportsMaterialSelectionChange(val)
      }
    },
    palletTransportsMaterialSelectionChange() {
      if(this.cid){
        selectAll({transportsId:this.cid}).then((res)=>{
          console.log(res.data.data);
              this.palletTransportsDetailData = res.data.data.map(el =>{
                return{
                  part_no:el.partNo,
                  part_desc:el.partDesc,
                  operation_task_no:el.operationTaskNo,
                  transfer_quantity:el.transferQuantity,
                  unit:el.unit,
                  to_ifs_location_no:el.toIfsLocationName,
                  state:el.state,
                  id:el.id,
                }
              })

        })}
      // this.palletTransportsMaterialMultipleSelection = val
      // if(val && val.length>0){
      //   let ids =[]
      //   this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
      //   let pId = ids[ids.length - 1];
      //   if(pId!=null){
      //     selectAll({
      //       transportsId:this.currPalletTransportsRow.id,
      //         transportsMaterialId: pId
      //       }).then((res) =>{
      //         this.palletTransportsDetailData = []
      //         if(res.data.data){
      //           this.palletTransportsDetailData.push(res.data.data)
      //         }
      //         })
      //      }else{
      //       this.palletTransportsDetailData = []
      //      }
      // }
    },
    //状态
    handleCommand(event){
      let str = ""
      console.log(event);
      if (event == "草稿") {
        str = "draft"
      }else if (event == "进行中") {
        str = "processing"
      }else{
        str = "finished"
      }

     if (this.cid) {
      updataStatus({id:this.cid,state:str}).then((res) =>{
        this.$refs.pallettransportsTable.getDataList()
      })
     }else{
        this.$message.error('请选择' + str + '的对象')
     }
    },
             // 单行选中
         handleCurrentChange(row) {
        this.palletTransportsMaterialMultipleSelection = row
               // this.palletTransportsMaterialData.forEach((item) => {
               //    // 排他,每次选择时把其他选项都清除
               //    if (item.id !== row.id) {
               //       item.commonChecked = false
               //    }else{
          //     item.commonChecked = true
          //   }
               // })
          // this.palletTransportsMaterialSelectionChange([row])
          // this.palletTransportsDetailData = data
         },
    // 工艺类型中文格式化
    formatStateType(row, column, cellValue) {
@@ -518,12 +641,10 @@
    openLocationDialog() {
      if (this.palletTransportsMaterialMultipleSelection.length > 0) {
        let flag = true
        console.log(this.palletTransportsMaterialMultipleSelection)
        this.palletTransportsMaterialMultipleSelection.forEach((item) => {
          if (item.detailExistState) {
            flag = false
          }
          console.log(item.detailExistState)
        })
        if (flag) {
          this.showLocation = true
@@ -578,14 +699,13 @@
    },
    // 获取移库明细数据列表
    getPalletTransportsDetailData() {
      // console.log("对应工单",this.WorkOrder);
      // console.log("选中物料需求",this.palletTransportsMaterialMultipleSelection);
      let transportsDetails =[]
      console.log(this.palletTransportsMaterialMultipleSelection,"----+");
      transportsDetails = this.palletTransportsMaterialMultipleSelection.map(el =>{
        return{
          partNo:el.partNo,
          partDesc: el.partDesc,
          transferQuantity: el.surplusQuantity,
          transferQuantity: 0,
          toIfsLocationNo:el.toIfsLocationNo,
          toIfsLocationName: el.toIfsLocationName,
          transportsId: el.transportsId,
@@ -604,19 +724,18 @@
                this.innerVisible = false
                this.$message.success('添加移库明细成功')
                let materialRow = selectionList[selectionList.length - 1]
                console.log("materialRow-----",materialRow);
                this.palletTransportsMaterialData.forEach(ele=>{
                  if(ele.id==materialRow.id){
                    console.log("ele-------",ele);
                      ele.transferQuantity = materialRow.surplusQuantity
                      ele.surplusQuantity = 0
                  }
                })
                this.getPalletTransportsMaterialData()
              } else {
                this.$message.error('添加移库明细失败')
              }
              // this.getPalletTransportsMaterialData()
              this.palletTransportsMaterialSelectionChange(selectionList)
              this.palletTransportsMaterialSelectionChange()
            })
            // .catch(() => {
            // })
@@ -652,7 +771,6 @@
    },
    // 打开单个明细批量更新库位弹框
    openSingleLocationDialog(row) {
      console.log(row);
      if (row.state === '01initial') {
        this.detailList = []
        this.detailList.push(row)
@@ -663,17 +781,15 @@
    },
    // 删除移库明细
    delDetail(row) {
      /* const delRow = this.palletTransportsDetailData.find((item) => {
       const delRow = this.palletTransportsDetailData.find((item) => {
        return item.id === row.id
      }) */

      }) 
      delPalletTransportsDetailObj(row.id).then((response) => {
        const resData = response.data
        if (resData.code === 0) {
          // const findRowIndex = this.palletTransportsDetailData.indexOf(delRow)
          // this.palletTransportsDetailData.splice(findRowIndex, 1)
          const findRowIndex = this.palletTransportsDetailData.indexOf(delRow)
          this.palletTransportsDetailData.splice(findRowIndex, 1)
          this.$message.success('移库明细删除成功')
          // this.getPalletTransportsMaterialData()
          const currRow = this.currPalletTransportsRow
          this.getPallettransportsData().then(() => {
            if (currRow) {
@@ -682,6 +798,32 @@
          })
        } else {
          this.$message.error('移库明细删除失败')
        }
      })
    },
    //改变
    moveLocation(val){
      console.log(val,"---->");
      let num = Number(val.transfer_quantity)
      this.palletTransportsDetailMultipleSelection.forEach(el =>{
                        console.log(el.transfer_quantity);
                        el.transfer_quantity = num
      })
      console.log(this.palletTransportsDetailMultipleSelection,"--->123");
     
    },
    updateStockFun(){
      let data = []
      data = this.palletTransportsDetailMultipleSelection.map(el =>{
          return {
              id:el.id,
              transferQuantity:el.transfer_quantity
          }
      })
      updateStock(data).then((res) =>{
        if(res.data.code===0){
          this.getPalletTransportsMaterialData()
          this.executeMove()
        }
      })
    },
@@ -705,6 +847,7 @@
            if (resData.code === 0) {
              this.$message.success('执行成功')
              // this.getPalletTransportsMaterialData()
              this.palletTransportsDetailData=[]
              const currRow = this.currPalletTransportsRow
              this.getPallettransportsData().then(() => {
                if (currRow) {
@@ -721,6 +864,7 @@
      } else {
        this.$message.error('请选择移库明细')
      }
     
    },
    selectDetailLocationCallback() {
      this.getPalletTransportsDetailData()
@@ -730,37 +874,8 @@
      this.currDetailRow = row
      this.showDetailStock = true
    },
    palletTransportsChange(val) {
      this.currPalletTransportsRow = val
      if (this.currPalletTransportsRow) {
        this.getPalletTransportsMaterialData()
        this.getOptasks()
      }
    },
    palletTransportsMaterialSelectionChange(val) {
      this.palletTransportsMaterialMultipleSelection = val
      console.log(this.palletTransportsMaterialMultipleSelection);
      if(val && val.length>0){
        let ids =[]
        this.palletTransportsMaterialMultipleSelection.forEach(el =>{ids.push(el.id)})
        let pId = ids[ids.length - 1];
        console.log(pId);
        if(pId!=null){
          selectAll({
              transportsId:this.currPalletTransportsRow.id,
              transportsMaterialId: pId
            }).then((res) =>{
              this.palletTransportsDetailData = []
              if(res.data.data){
                this.palletTransportsDetailData.push(res.data.data)
              }
              })
           }else{
            this.palletTransportsDetailData = []
           }
      }
    },
    palletTransportsDetailSelectionChange(val) {
      console.log(val,"-=-=-=");
      this.palletTransportsDetailMultipleSelection = val
    },
    getOptasks() {