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

zouyu

2023-12-29 1b155247789662eb26f36463ebd159d39a993db0

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

 src/api/warehouse/pallettransports.js

@@ -17,18 +17,27 @@
  })
}
//移库改变
export function updataStatus(obj) {
  return request({
    url: '/mes/palletTransports/'+ obj.id,
    method: 'post',
    params: obj
  })
}

//状态改变
export function updateStock(obj) {
  return request({
    url: '/mes/palletTransportsMaterial/updateStock',
    method: 'post',
    data: obj
  })
}

export function getPalletTransportsObj(id) {
export function getPalletTransportsObj(obj) {
  return request({
    url: '/mes/palletTransports/' + id,
    method: 'get'
    method: 'get',
    data: obj
  })
}


 src/views/warehouse/pallettransports/index.vue

@@ -9,6 +9,18 @@
            <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>

@@ -191,6 +203,7 @@
      <!-- 弹窗, 明细的IFS库位列表 -->
      <detailIfsLocationDialog :currshowlist.sync="showDetailLocation" :detailList="detailList"
        @refreshDataList="selectDetailLocationCallback" />
        
    </basic-container>
  </div>
</template>
@@ -207,6 +220,7 @@
  executeMoveLocation,
  selectAll,
  updateStock,
  updataStatus,
} from '@/api/warehouse/pallettransports'
import { getByPalletTransId } from '@/api/plan/operationtask'
import ttable from '@/views/common/ztt-table.vue'
@@ -222,6 +236,12 @@
export default {
  data() {
    return {
      taskTypeArr: [
        {label:"草稿"},
        {label:"进行中"},
        {label:"已完成"},
    ],
    command:"",
      forbidden:false,
      partDesc: null,
      ajaxFun: palletTransportsFetchList,
@@ -369,6 +389,23 @@
    //     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() {
     if(this.permissions.warehouse_pallettransports_edit){
@@ -408,9 +445,7 @@
                }
              })

        })
              
        }
        })}
      // this.palletTransportsMaterialMultipleSelection = val
      // if(val && val.length>0){
      //   let ids =[]
@@ -431,6 +466,26 @@
      //      }
      // }
    },
    //状态
    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