盘点测试

ruoyi-ui/src/views/check/job/in/index.vue

@@ -514,7 +514,7 @@ export default {
 
     // 手动完成/作废
     handleCompletedManually(row) {
-      console.log("1111")
+      //console.log("1111")
       const jobIds = this.ids;
       if (jobIds.length === 0) {
         this.$modal.msgError("请选择要操作的数据");
@@ -531,11 +531,13 @@ export default {
         //手动作废
         manualInvalidation(data).then(response => {
           this.$modal.msgSuccess("操作成功");
+          this.getList();
         })
       }else if (row.type === 'completed'){
         //手动完成
         manualCompleted(data).then(response => {
           this.$modal.msgSuccess("操作成功");
+          this.getList();
         })
       }
     },

ruoyi-ui/src/views/check/job/out/index.vue

@@ -320,7 +320,8 @@
 <!--        </template>-->
 <!--      </el-table-column>-->
       <el-table-column :label="$t('checkJobOut.billId')" align="center" prop="inOrOutId" /> <!-- 单据ID -->
-      <el-table-column :label="$t('checkJobOut.subBillId')" align="center" prop="productId" /> <!-- 子单据ID -->
+      <el-table-column :label="$t('checkJobOut.subBillId')" align="center" prop="inOrOutDId" /> <!-- 单据ID -->
+      <el-table-column :label="$t('checkJobOut.productId')" align="center" prop="productId" /> <!-- 物料id -->
       <el-table-column :label="$t('checkJobOut.materialDesc')" align="center" prop="extraField.materialDesc" /> <!-- 物料编码 -->
       <el-table-column :label="$t('checkJobOut.englishDesc')" align="center" prop="extraField.englishDesc" /> // 英文描述
 <!--      <el-table-column :label="$t('checkJobOut.cartonNo')" align="center" prop="extraField.cartonNo" /> // 箱号-->