Merge branch 'ryzhwcs' of http://47.97.1.152:5880/r/zy-wcs into ryzhwcs

zyx

2024-01-31 ca8f5a8f133e7f5b00b9d35ff6d15720804569af

 src/main/webapp/views/taskWrk/taskWrk.html

@@ -31,6 +31,16 @@
                  <el-form-item label="">
                     <el-input v-model="tableSearchParam.wrk_no" placeholder="工作号"></el-input>
                  </el-form-item>
                  <el-form-item label="">
                     <el-date-picker
                           v-model="tableSearchParam.datetime"
                           value-format="yyyy-MM-dd HH:mm:ss"
                           type="datetimerange"
                           range-separator="至"
                           start-placeholder="开始日期"
                           end-placeholder="结束日期">
                     </el-date-picker>
                  </el-form-item>
                  <el-form-item>
                     <el-button type="primary" @click="getTableData">查询</el-button>
                     <el-button type="primary" @click="resetParam">重置</el-button>
@@ -72,6 +82,8 @@
                  <el-table-column property="barcode" label="托盘码">
                  </el-table-column>
                  <el-table-column property="crnNo" label="堆垛机号">
                  </el-table-column>
                  <el-table-column property="ioPri" label="优先级">
                  </el-table-column>
               </el-table>

@@ -116,7 +128,8 @@
               tableSearchParam: {
                  task_no: null,
                  status: null,
                  wrk_no: null
                  wrk_no: null,
                  datetime: null,
               },
               taskWrkFormVisible: false,
               taskWrkForm: {},
@@ -141,9 +154,13 @@
               },
               getTableData() {
                  let that = this;
                  let data = this.tableSearchParam
                  let data = JSON.parse(JSON.stringify(this.tableSearchParam))
                  data.curr = this.currentPage
                  data.limit = this.pageSize
                  if (this.tableSearchParam.datetime != null) {
                     data.datetime = null
                     data.create_time = this.tableSearchParam.datetime[0] + " - " + this.tableSearchParam.datetime[1]
                  }
                  $.ajax({
                     url: baseUrl + "/taskWrk/list/auth",
                     headers: {
@@ -260,7 +277,7 @@
                  });
               },
               completeWrk(row){
                  //派发任务
                  //完成任务
                  let that = this
                  $.ajax({
                     url: baseUrl + "/taskWrk/complete/auth",