Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6

hwh

2024-09-14 f735e389c01eed24d6b9792b35d2f98d15f3ecbb

 Web/src/views/wcs/wcsTask/index.vue

@@ -35,6 +35,16 @@
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                <el-form-item label="托盘号">
                  <el-input v-model="queryParams.palletNo" clearable="" placeholder="请输入托盘号" />
                </el-form-item>
              </el-col>
              <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
                <el-form-item label="来源">
                  <el-input v-model="queryParams.origin" clearable="" placeholder="请输入来源" />
                </el-form-item>
              </el-col>
              <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
                <el-form-item>
                  <el-button-group style="display: flex; align-items: center;">
@@ -70,16 +80,39 @@
                  scope.row.status)?.name }}</el-tag>
              </template>
            </el-table-column>
            <el-table-column prop="origin" label="来源" show-overflow-tooltip="" />
            <el-table-column prop="startLocate" label="起始位置" show-overflow-tooltip="" />
            <el-table-column prop="endLocate" label="结束位置" show-overflow-tooltip="" />
            <el-table-column prop="palletNo" label="托盘号" show-overflow-tooltip="" />
            <el-table-column prop="completeQty" label="拆垛箱数" show-overflow-tooltip="" />
            <el-table-column prop="palletQty" label="整跺箱数" show-overflow-tooltip="" />
            <el-table-column prop="lotNo" label="批次号" show-overflow-tooltip="" />
            <el-table-column prop="skuNo" label="物料编码" show-overflow-tooltip="" />
            <el-table-column prop="skuName" label="物料名称" show-overflow-tooltip="" />
            <el-table-column prop="unstackingMode" width="100" label="拆垛方式" show-overflow-tooltip="">            
              <template #default="scope">
                <span v-if="scope.row.unstackingMode">
                  <el-tag :type="dv('UnstackingModeEnum', scope.row.unstackingMode)?.tagType"> {{ dv('UnstackingModeEnum',
                  scope.row.unstackingMode)?.name }}</el-tag>
                </span>                
              </template>
            </el-table-column>
            <el-table-column prop="isBind" width="85" label="是否绑定" show-overflow-tooltip="">            
              <template #default="scope">
                <span v-if="scope.row.isBind!=null">
                  <el-tag :type="dv('IsBindEnum', scope.row.isBind)?.tagType"> {{ dv('IsBindEnum',
                  scope.row.isBind)?.name }}</el-tag>
                </span>                
              </template>
            </el-table-column>
            <el-table-column prop="stationNum" label="拆垛工位号" show-overflow-tooltip="" />
            <el-table-column prop="cancelDate" label="取消时间" show-overflow-tooltip="" />
            <el-table-column prop="finishDate" label="完成时间" show-overflow-tooltip="" />
            <el-table-column label="修改记录" width="80" align="center" show-overflow-tooltip>
            <!-- <el-table-column label="修改记录" width="80" align="center" show-overflow-tooltip>
              <template #default="scope">
                <ModifyRecord :data="scope.row" />
              </template>
            </el-table-column>
            </el-table-column> -->
            <el-table-column prop="操作" label="操作" width="130" align="center" fixed="right" show-overflow-tooltip=""
              v-if="auth('wcsTask:complete') || auth('wcsTask:cancell')">
              <template #default="scope">
@@ -126,14 +159,15 @@
            border="">
            <el-table-column type="index" label="序号" width="55" align="center" />
            <el-table-column prop="taskNo" label="任务号" show-overflow-tooltip="" />
            <el-table-column prop="plcId" label="交互工位号" show-overflow-tooltip="" />
            <!-- <el-table-column prop="plcId" label="交互工位号" show-overflow-tooltip="" /> -->
            <el-table-column prop="plcName" label="交互位置" show-overflow-tooltip="" />
            <el-table-column prop="interactiveMsg" label="交互信息" show-overflow-tooltip="" />
            <el-table-column label="修改记录" width="80" align="center" show-overflow-tooltip>
            <el-table-column prop="createTime" label="交互时间" show-overflow-tooltip="" />
            <!-- <el-table-column label="修改记录" width="80" align="center" show-overflow-tooltip>
              <template #default="scope">
                <ModifyRecord :data="scope.row" />
              </template>
            </el-table-column>
            </el-table-column> -->
          </el-table>
          <el-pagination v-model:currentPage="tableParams2.page" v-model:page-size="tableParams2.pageSize"
            :total="tableParams2.total" :page-sizes="[10, 20, 50, 100, 200, 500]" size="small" background=""
@@ -170,12 +204,12 @@
const queryParams2 = ref<any>({});
const tableParams = ref({
  page: 1,
  pageSize: 10,
  pageSize: 20,
  total: 0,
});
const tableParams2 = ref({
  page: 1,
  pageSize: 10,
  pageSize: 20,
  total: 0,
});
const printWcsTaskTitle = ref("");