修改了工作方式，界面增加字段的查询

src/layout/taskMonitor.vue

@@ -13,7 +13,8 @@
       </el-row>
       <br/>
       <el-table :data="tasks" stripe border v-loading="loading" style="width: 100%" max-height="684px"
-                class="table-class" :header-cell-style="{ 'text-align': 'center' }" :cell-style="{ 'text-align': 'center' }"
+                class="table-class" :header-cell-style="{ 'text-align': 'center' }"
+                :cell-style="{ 'text-align': 'center' }"
                 @row-click="getCurrentRow">
         <el-table-column width="65px" fixed="left">
           <template v-slot="scope">
@@ -32,8 +33,11 @@
         <el-table-column prop="goodsRelated.originNum" label="库存数量" min-width="120px"/>
         <el-table-column prop="taskPriority" label="任务优先级" min-width="120px"/>
         <el-table-column prop="preTask" label="前置任务" min-width="120px" show-overflow-tooltip/>
-                <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px" show-overflow-tooltip />
+        <el-table-column prop="pickStand" label="下发站台" min-width="120px" show-overflow-tooltip/>
-                <el-table-column prop="createTime" label="运行时长" :formatter="dueFormat" min-width="120px" show-overflow-tooltip />
+        <el-table-column prop="createTime" label="创建时间" :formatter="timeFormat" min-width="120px"
+                         show-overflow-tooltip/>
+        <el-table-column prop="createTime" label="运行时长" :formatter="dueFormat" min-width="120px"
+                         show-overflow-tooltip/>
         <el-table-column prop="userName" label="操作人员姓名" min-width="120px"/>
         <el-table-column prop="taskStatus" label="任务状态" fixed="right" :formatter="taskStatusFormat"
                          min-width="120px" show-overflow-tooltip/>
@@ -242,11 +246,16 @@ export default {
     },
     taskTypeFormat: (row, column, cellValue, index) => {
       switch (cellValue) {
-                case 1: return '入库'
+        case 1:
-                case 2: return '出库'
+          return '入库'
-                case 3: return '盘点'
+        case 2:
-                case 9: return '移库'
+          return '出库'
-                default: return '未知'
+        case 3:
+          return '盘点'
+        case 9:
+          return '移库'
+        default:
+          return '未知'
       }
     },
     dueFormat: (row, column, cellValue, index) => {

src/layout/workFlow.vue

@@ -44,6 +44,7 @@
         <el-table-column prop="goodsId" label="料号" min-width="120px" show-overflow-tooltip/>
         <el-table-column prop="needNum" label="需求数量" min-width="120px"/>
         <el-table-column prop="pickedNum" label="已拣数量" min-width="120px"/>
+        <el-table-column prop="distributedNum" label="已分配数量" min-width="120px"/>
         <el-table-column prop="lightStatus" label="亮灯状态" :formatter="lightStatusFormat" min-width="120px"/>
         <el-table-column prop="workStatus" label="工作状态" :formatter="workStatusFormat" min-width="120px"/>
         <el-table-column prop="machineType" label="机型" :formatter="machineTypeFormat" min-width="120px"/>
@@ -52,7 +53,7 @@
                          show-overflow-tooltip/>
         <el-table-column prop="finishTime" label="完成时间" :formatter="timeFormat" min-width="120px"
                          show-overflow-tooltip/>
-        <el-table-column prop="opUser" label="操作用户" min-width="120px"/>
+        <el-table-column prop="opUser" label="操作用户" min-width="120px" show-overflow-tooltip/>
         <el-table-column fixed="right" label="操作" width="120px">
           <template v-slot="scope">
             <el-button plain type="primary" @click="editCurrentRow(scope.row)">编辑</el-button>
@@ -152,6 +153,13 @@
                   <el-input v-model="workFlowFormEntity.opUser" disabled/>
                 </el-form-item>
               </el-col>
+              <el-col :span="12">
+                <el-form-item label="已分配数量" prop="distributedNum">
+                  <el-input-number v-model.number="workFlowFormEntity.distributedNum"
+                                   controls-position="right" :min="0" :max="workFlowFormEntity.needNum"
+                                   clearable/>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </div>
@@ -344,6 +352,8 @@ export default {
     },
     workStatusFormat: (row, column, cellValue, index) => {
       switch (cellValue) {
+        case -1:
+          return '暂存'
         case 0:
           return '未开始'
         case 1:
@@ -382,6 +392,7 @@ export default {
         goodsId: row.goodsId,
         pickedNum: row.pickedNum,
         needNum: row.needNum,
+        distributedNum: row.distributedNum,
         lightStatus: row.lightStatus,
         workStatus: row.workStatus,
         createTime: row.createTime,
@@ -394,6 +405,7 @@ export default {
       const params = {
         workFlowId: formData.workFlowId,
         pickedNum: formData.pickedNum,
+        distributedNum: formData.distributedNum,
         lightStatus: formData.lightStatus,
         workStatus: formData.workStatus,
         userName: store.getters.getUserName

src/views/login.vue

@@ -35,12 +35,14 @@ function base64URLEncode(str) {
       .replace(/\//g, '_')
       .replace(/=/g, '');
 }
+
 var verifier = base64URLEncode(crypto.randomBytes(32));
 // Dependency: Node.js crypto module
 // https://nodejs.org/api/crypto.html#crypto_crypto
 function sha256(buffer) {
   return crypto.createHash('sha256').update(buffer).digest();
 }
+
 var challenge = base64URLEncode(sha256(verifier));
 
 const loginForm = reactive({
@@ -97,13 +99,17 @@ const loginCate = () => {
   // window.open(cateLoginUrl)// 不打开新窗口
 }
 onMounted(() => {
-    if (router.currentRoute.value.query.code !== undefined) {
+  const urlParams = new URLSearchParams(window.location.search);
+  const code = urlParams.get('code');
+  console.log(code); // 输出 ?code= 后面的值
+  if (code !== undefined && code !== null && code !== '') {
+    console.log('跳转并尝试登录。code：' + code)
     loading.open('请求登录中...')
     const tokenParam = {
       code_verifier: store.getters.getVerify,
-            client_id: '609f8296-74ab-441e-904f-3a8508030511',
+      client_id: 'f921b5f5-ba70-4bcb-8a4b-f3c7d90ec84e',
       // scope: 'openid',
-            code: router.currentRoute.value.query.code,
+      code: code,
       redirect_uri: 'https://csclasrs.ecorp.cat.com/wms',
       grant_type: 'authorization_code',
       // client_secret: 'o6h8Q~iLegnIBG.GzJngXk.03FYdBJzIoCtTtcwj',