盘点模块国际化

ruoyi-admin/src/main/java/com/ruoyi/check/difference/service/impl/CheckDifferenceRecordServiceImpl.java

@@ -75,6 +75,9 @@ public class CheckDifferenceRecordServiceImpl implements ICheckDifferenceRecordS
             if (!"1".equals(basStock.getProductStatus())){
                 return AjaxResult.warn("库存非正常状态");
             }
+            if (basStock.getQuantity().equals(checkDifferenceRecord.getNewQuantity())){
+                return AjaxResult.success();
+            }
             basStock.setProductStatus("2");
             basStockService.updateBasStock(basStock);
             checkDifferenceRecord.setCargoSpaceId(basStock.getCargoSpaceId());

ruoyi-ui/src/lang/zh.js

@@ -466,6 +466,7 @@ export default {
     auditTitle:'审核单据',
     selectExit:'选择出口',
     pleaseSelectExit:'请选择出口',
+    defaultExit:'人工出口'
   },
   // ***************盘点入库作业*************
   checkJobIn: {
@@ -537,7 +538,10 @@ export default {
     netWeight:"净重",
     totalNetWeight:"总净重",
     grossWeight:"毛重",
-    onlyOneCanAutoAllocation:"请选择一条分配单据"
+    onlyOneCanAutoAllocation:"请选择一条分配单据",
+    selectDataRequired:'请选择要操作的数据',
+    selectOneDataRequired:'请选择一条任务',
+    operaSuccess:'操作成功',
   },
   // **************盘点出库作业****************
   checkJobOut: {
@@ -651,7 +655,11 @@ export default {
     inputOldQuantity: '请输入原值',
     inputNewQuantity: '请输入新值',
     inputProductGuid: '请输入物料guid',
-    inputRecordType:'请选择操作方式'
+    inputRecordType:'请选择操作方式',
+    confirmNotPass:'是否确认不通过盘点差异编号为',
+    confirmNPass:'是否确认通过盘点差异编号为',
+    deleteSuccess:'审核不通过成功',
+    auditSuccess:'审核成功',
   },
   // ********************库存信息*************
   stockManagement: {

ruoyi-ui/src/views/check/create/index.vue

@@ -12,13 +12,6 @@
             />
           </el-select>
         </el-form-item>
-        <!-- <el-form-item :label="$t('checkCreate.customer')" prop="customerNo" required> &lt;!&ndash; 客户 &ndash;&gt;
-          <el-input
-            v-model="formData.customerNo"
-            :placeholder="$t('checkCreate.inputCustomerNo')"
-            clearable
-          />
-        </el-form-item>-->
         <el-form-item :label="$t('checkCreate.documentType')" prop="checkType" required> <!-- 单据类型 -->
           <el-select v-model="formData.checkType" :placeholder="$t('checkCreate.selectDocumentType')" clearable @change="handleCheckTypeChange">
             <el-option

ruoyi-ui/src/views/check/difference/index.vue

@@ -41,46 +41,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item :label="$t('checkDifference.lotNo')" prop="lotNo"> &lt;!&ndash; 批次号 &ndash;&gt;
-        <el-input
-          v-model="queryParams.lotNo"
-         :placeholder="$t('checkDifference.inputLotNo')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-<!--      <el-form-item label="供应商" prop="supplier">
-        <el-input
-          v-model="queryParams.supplier"
-          placeholder="请输入供应商"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户" prop="customer">
-        <el-input
-          v-model="queryParams.customer"
-          placeholder="请输入客户"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-<!--      <el-form-item label="原值" prop="oldQuantity">
-        <el-input
-          v-model="queryParams.oldQuantity"
-          placeholder="请输入原值"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="新值" prop="newQuantity">
-        <el-input
-          v-model="queryParams.newQuantity"
-          placeholder="请输入新值"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
         <el-select
           v-model="queryParams.warehouseId"
@@ -116,14 +76,6 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item :label="$t('checkDifference.productGuid')" prop="productGuid"> 物料guid
-        <el-input
-          v-model="queryParams.productGuid"
-          placeholder="请输入物料guid"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('checkDifference.search')}}</el-button> <!-- 搜索 -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('checkDifference.reset')}}</el-button> <!-- 重置 -->
@@ -406,11 +358,11 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const checkGuids = row.checkGuid || this.ids
-      this.$modal.confirm('是否确认删除盘点差异编号为"' + checkGuids + '"的数据项？').then(function() {
+      this.$modal.confirm(this.$t('checkDifference.confirmNotPass') + checkGuids).then(function() {
         return delDifference(checkGuids)
       }).then(() => {
         this.getList()
-        this.$modal.msgSuccess("删除成功")
+        this.$modal.msgSuccess(this.$t('checkDifference.deleteSuccess'))
       }).catch(() => {})
     },
     /** 导出按钮操作 */
@@ -422,11 +374,11 @@ export default {
     /** 审核按钮操作 */
     handleAudit() {
       const checkGuids = this.ids
-      this.$modal.confirm('是否确认审核选中的' + checkGuids.length + '条数据？').then(function() {
+      this.$modal.confirm(this.$t('checkDifference.confirmPass') + checkGuids.length).then(function() {
         return auditDifference(checkGuids)
       }).then(() => {
         this.getList()
-        this.$modal.msgSuccess("审核成功")
+        this.$modal.msgSuccess(this.$t('checkDifference.auditSuccess'))
       }).catch(() => {})
     },
   }

ruoyi-ui/src/views/check/flat/index.vue

@@ -27,27 +27,6 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item :label="$t('stockManagement.cargoSpaceStockStatus')" prop="cargoSpaceStockStatus">&lt;!&ndash; 货位状态 &ndash;&gt;
-        <el-select v-model="queryParams.cargoSpaceStockStatus" :placeholder="$t('stockManagement.cargoSpaceStockStatus')" clearable>
-          <el-option
-            v-for="dict in dict.type.cargo_space_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>-->
-<!--      <el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus">&lt;!&ndash; 物料状态 &ndash;&gt;
-        <el-select v-model="queryParams.productStatus" :placeholder="$t('stockManagement.selectProductStatus')" clearable>
-          <el-option
-            v-for="dict in dict.type.product_status"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>-->
-
       <el-form-item :label="$t('stockManagement.inDate')" prop="startDate">
         <el-date-picker clearable
                         v-model="queryParams.inDate"
@@ -56,38 +35,6 @@
                         :placeholder="$t('stockManagement.inputInDate')">
         </el-date-picker>
       </el-form-item>
-      <!--      <el-form-item label="回流时间" prop="backDate">
-              <el-input
-                v-model="queryParams.backDate"
-                placeholder="请输入回流时间"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="物料GUID" prop="productGuid">
-              <el-input
-                v-model="queryParams.productGuid"
-                placeholder="请输入物料GUID"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="库存数量" prop="quantity">
-              <el-input
-                v-model="queryParams.quantity"
-                placeholder="请输入库存数量"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="作业ID" prop="jobId">
-              <el-input
-                v-model="queryParams.jobId"
-                placeholder="请输入作业ID"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>-->
       <el-form-item :label="$t('stockManagement.trayCode')" prop="trayCode"><!-- 托盘条码 -->
         <el-input
           v-model="queryParams.trayCode"
@@ -105,38 +52,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!--      <el-form-item label="出库数量" prop="outQuantity">
-              <el-input
-                v-model="queryParams.outQuantity"
-                placeholder="请输入出库数量"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="入库子单id" prop="stockinDetailId">
-              <el-input
-                v-model="queryParams.stockinDetailId"
-                placeholder="请输入入库子单id"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="入库主单" prop="stockinId">
-              <el-input
-                v-model="queryParams.stockinId"
-                placeholder="请输入入库主单"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="入库班组ID" prop="inClassId">
-              <el-input
-                v-model="queryParams.inClassId"
-                placeholder="请输入入库班组ID"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>-->
       <el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"><!-- 仓库id -->
         <el-select v-model="queryParams.warehouseId" :placeholder="$t('stockManagement.warehouseId')">
           <el-option
@@ -147,55 +62,6 @@
           />
         </el-select>
       </el-form-item>
-
-      <!--      <el-form-item label="备用字段1" prop="spare1">
-              <el-input
-                v-model="queryParams.spare1"
-                placeholder="请输入备用字段1"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="备用字段2" prop="spare2">
-              <el-input
-                v-model="queryParams.spare2"
-                placeholder="请输入备用字段2"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="备用字段3" prop="spare3">
-              <el-input
-                v-model="queryParams.spare3"
-                placeholder="请输入备用字段3"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="备用字段4" prop="spare4">
-              <el-input
-                v-model="queryParams.spare4"
-                placeholder="请输入备用字段4"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="备用字段5" prop="spare5">
-              <el-input
-                v-model="queryParams.spare5"
-                placeholder="请输入备用字段5"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="备用字段6" prop="spare6">
-              <el-input
-                v-model="queryParams.spare6"
-                placeholder="请输入备用字段6"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('stockManagement.search')}}</el-button><!-- 搜索 -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('stockManagement.reset')}}</el-button><!-- 重置 -->
@@ -235,7 +101,7 @@
           v-hasPermi="['stock:management:remove']"
         >{{$t('stockManagement.delete')}} <!-- 删除 --></el-button>
       </el-col>
-      <el-col :span="1.5">
+<!--      <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -243,8 +109,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['stock:management:export']"
-        >{{$t('stockManagement.export')}} <!-- 导出 --></el-button>
+        >{{$t('stockManagement.export')}} &lt;!&ndash; 导出 &ndash;&gt;</el-button>
-      </el-col>
+      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -277,11 +143,8 @@
       <el-table-column :label="$t('stockManagement.height')" align="right" prop="extraField.height" /> <!-- 高 -->
       <el-table-column :label="$t('stockManagement.volume')" align="right" prop="extraField.volume" /> <!-- 体积 -->
       <el-table-column :label="$t('stockManagement.quantity')" align="right" prop="quantity" /> <!-- 库存数量 -->
-      <el-table-column :label="$t('stockManagement.jobId')" align="left" prop="jobId" /> <!-- 作业ID -->
-      <el-table-column :label="$t('stockManagement.trayCode')" align="left" prop="trayCode" /> <!-- 托盘条码 -->
       <el-table-column :label="$t('stockManagement.stockinId')" align="left" prop="stockinId" /> <!-- 入库主单 -->
       <el-table-column :label="$t('stockManagement.stockinDetailId')" align="left" prop="stockinDetailId" /> <!-- 入库子单id -->
-      <el-table-column :label="$t('stockManagement.inType')" align="left" prop="inType" /> <!-- 入库类型 -->
       <el-table-column :label="$t('stockManagement.warehouseId')" align="left" prop="warehouseName" /> <!-- 仓库 -->
       <el-table-column :label="$t('stockManagement.inDate')" align="left" prop="inDate" /> <!-- 入库时间 -->
       <el-table-column :label="$t('stockManagement.operation')" align="center" class-name="small-padding fixed-width"> <!-- 操作 -->
@@ -315,12 +178,6 @@
     <!-- 新增库存信息对话框 -->
     <el-dialog :title="$t('stockManagement.addTitle')" :visible.sync="addOpen" width="500px" append-to-body>
       <el-form ref="addForm" :model="addForm" :rules="addRules" label-width="80px">
-        <!--<el-form-item :label="$t('stockManagement.stockId')" prop="stockId"> &lt;!&ndash; 库存id &ndash;&gt;
-          <el-input v-model="addForm.stockId" :placeholder="$t('stockManagement.inputStockId')" />
-        </el-form-item>-->
-<!--    <el-form-item :label="$t('stockManagement.productId')" prop="productId"> &lt;!&ndash; 物料编码 &ndash;&gt;
-          <el-input v-model="addForm.extraField.productId" :placeholder="$t('stockManagement.inputProductId')" />
-        </el-form-item>-->
         <el-form-item :label="$t('stockManagement.warehouseId')" prop="warehouseId"> <!-- 仓库 -->
           <el-select v-model="addForm.warehouseId" :placeholder="$t('stockManagement.inputWarehouseId')" clearable>
             <el-option

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

@@ -19,16 +19,6 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="上线类型" prop="onLineType">
-        <el-select v-model="queryParams.onLineType" placeholder="请选择上线类型" clearable>
-          <el-option
-            v-for="dict in dict.type.on_line_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>-->
       <el-form-item :label="$t('checkJobIn.taskNo')" prop="taskNo"> <!--任务号-->
         <el-input
           v-model="queryParams.taskNo"
@@ -37,30 +27,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="供应商ID" prop="supplierId">
-        <el-input
-          v-model="queryParams.supplierId"
-          placeholder="请输入供应商ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户ID" prop="customerId">
-        <el-input
-          v-model="queryParams.customerId"
-          placeholder="请输入客户ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门ID" prop="departmentId">
-        <el-input
-          v-model="queryParams.departmentId"
-          placeholder="请输入部门ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item :label="$t('checkJobIn.trayCode')" prop="trayCode"> <!--托盘码-->
         <el-input
           v-model="queryParams.trayCode"
@@ -69,62 +35,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="巷道ID" prop="roadwayId">
+
-        <el-input
-          v-model="queryParams.roadwayId"
-          placeholder="请输入巷道ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-<!--      <el-form-item label="货位ID" prop="cargoSpaceId">
-        <el-input
-          v-model="queryParams.cargoSpaceId"
-          placeholder="请输入货位ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-<!--      <el-form-item label="目标巷道ID" prop="targetRoadwayId">
-        <el-input
-          v-model="queryParams.targetRoadwayId"
-          placeholder="请输入目标巷道ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item :label="$t('checkJobIn.targetCargoSpace')" prop="targetCargoSpaceId"> <!--目标货位-->
-        <el-input
-          v-model="queryParams.targetCargoSpaceId"
-          :placeholder="$t('checkJobIn.inputTargetCargoSpace')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--      <el-form-item label="产线ID" prop="lineId">
-        <el-input
-          v-model="queryParams.lineId"
-          placeholder="请输入产线ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车间ID" prop="workshopId">
-        <el-input
-          v-model="queryParams.workshopId"
-          placeholder="请输入车间ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="优先级" prop="priority">
-        <el-input
-          v-model="queryParams.priority"
-          placeholder="请输入优先级"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item :label="$t('checkJobIn.executionPhase')" prop="executionPhase"> <!--执行阶段-->
         <el-select v-model="queryParams.executionPhase" :placeholder="$t('checkJobIn.selectExecutionPhase')" clearable>
           <el-option
@@ -169,22 +80,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('checkJobIn.exit')" prop="exitId"> <!--出口-->
+
-        <el-input
-          v-model="queryParams.exitId"
-          :placeholder="$t('checkJobIn.inputExitId')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--      <el-form-item label="班组ID" prop="classId">
-        <el-input
-          v-model="queryParams.classId"
-          placeholder="请输入班组ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
         <el-select
           v-model="queryParams.warehouseId"
@@ -200,14 +96,6 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="重分标记" prop="faultFlag">
-        <el-input
-          v-model="queryParams.faultFlag"
-          placeholder="请输入重分标记"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('checkJobIn.search')}}</el-button> <!--搜索-->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('checkJobIn.reset')}}</el-button> <!--重置-->
@@ -407,7 +295,6 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      // 表单校验
       rules: {
         jobId: [
           { required: true, message: this.$t('checkJobIn.jobIdRequired'), trigger: "blur" }
@@ -518,11 +405,11 @@ export default {
       //console.log("1111")
       const jobIds = this.ids;
       if (jobIds.length === 0) {
-        this.$modal.msgError("请选择要操作的数据");
+        this.$modal.msgError(this.$t('checkJobIn.selectDataRequired'));
         return;
       }
       if (jobIds.length > 1) {
-        this.$modal.msgError("请选择一条任务");
+        this.$modal.msgError(this.$t('checkJobIn.selectOneDataRequired'));
         return;
       }
       var data = {
@@ -531,13 +418,13 @@ export default {
       if (row.type === 'invalid'){
         //手动作废
         manualInvalidation(data).then(response => {
-          this.$modal.msgSuccess("操作成功");
+          this.$modal.msgSuccess(this.$t('checkJobIn.operaSuccess'));
           this.getList();
         })
       }else if (row.type === 'completed'){
         //手动完成
         manualCompleted(data).then(response => {
-          this.$modal.msgSuccess("操作成功");
+          this.$modal.msgSuccess(this.$t('checkJobIn.operaSuccess'));
           this.getList();
         })
       }

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

@@ -19,16 +19,6 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="上线类型" prop="onLineType">
-        <el-select v-model="queryParams.onLineType" placeholder="请选择上线类型" clearable>
-          <el-option
-            v-for="dict in dict.type.on_line_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>-->
       <el-form-item :label="$t('checkJobOut.taskNo')" prop="taskNo"> <!-- 任务号 -->
         <el-input
           v-model="queryParams.taskNo"
@@ -37,30 +27,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="供应商ID" prop="supplierId">
-        <el-input
-          v-model="queryParams.supplierId"
-          placeholder="请输入供应商ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户ID" prop="customerId">
-        <el-input
-          v-model="queryParams.customerId"
-          placeholder="请输入客户ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="部门ID" prop="departmentId">
-        <el-input
-          v-model="queryParams.departmentId"
-          placeholder="请输入部门ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item :label="$t('checkJobOut.trayCode')" prop="trayCode"> <!-- 托盘码 -->
         <el-input
           v-model="queryParams.trayCode"
@@ -69,62 +35,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="巷道ID" prop="roadwayId">
-        <el-input
-          v-model="queryParams.roadwayId"
-          placeholder="请输入巷道ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-<!--      <el-form-item label="货位ID" prop="cargoSpaceId">
-        <el-input
-          v-model="queryParams.cargoSpaceId"
-          placeholder="请输入货位ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-<!--      <el-form-item label="目标巷道ID" prop="targetRoadwayId">
-        <el-input
-          v-model="queryParams.targetRoadwayId"
-          placeholder="请输入目标巷道ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
-      <el-form-item :label="$t('checkJobOut.targetCargoSpace')" prop="targetCargoSpaceId"> <!-- 目标货位 -->
-        <el-input
-          v-model="queryParams.targetCargoSpaceId"
-          :placeholder="$t('checkJobOut.inputTargetCargoSpace')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-<!--      <el-form-item label="产线ID" prop="lineId">
-        <el-input
-          v-model="queryParams.lineId"
-          placeholder="请输入产线ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="车间ID" prop="workshopId">
-        <el-input
-          v-model="queryParams.workshopId"
-          placeholder="请输入车间ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="优先级" prop="priority">
-        <el-input
-          v-model="queryParams.priority"
-          placeholder="请输入优先级"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item :label="$t('checkJobOut.executionPhase')" prop="executionPhase"> <!-- 执行阶段 -->
         <el-select v-model="queryParams.executionPhase" :placeholder="$t('checkJobOut.selectExecutionPhase')" clearable>
           <el-option
@@ -161,14 +71,7 @@
           :placeholder="$t('checkJobOut.selectFinishTime')">
         </el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('checkJobOut.entranceId')" prop="entranceId"> <!-- 入口ID -->
+
-        <el-input
-          v-model="queryParams.entranceId"
-          :placeholder="$t('checkJobOut.inputEntranceId')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item :label="$t('checkJobOut.exitId')" prop="exitId"> <!-- 出口ID -->
         <el-input
           v-model="queryParams.exitId"
@@ -177,14 +80,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-<!--      <el-form-item label="班组ID" prop="classId">
-        <el-input
-          v-model="queryParams.classId"
-          placeholder="请输入班组ID"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item :label="$t('inReceiveStockin.warehouseId')" prop="warehouseId"><!--仓库-->
         <el-select
           v-model="queryParams.warehouseId"
@@ -200,14 +95,6 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="重分标记" prop="faultFlag">
-        <el-input
-          v-model="queryParams.faultFlag"
-          placeholder="请输入重分标记"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('checkJobOut.search')}}</el-button> <!-- 搜索 -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('checkJobOut.reset')}}</el-button> <!-- 重置 -->
@@ -236,16 +123,6 @@
           v-hasPermi="['job:job:checkMydoJob:OuthandInvalidation']"
         >{{$t('checkJobOut.manualFinish')}}</el-button> <!-- 手动完成 -->
       </el-col>
-  <!-- <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['job:mydoJob:export']"
-        >导出</el-button>
-      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

ruoyi-ui/src/views/check/stockCheck/index.vue

@@ -29,22 +29,6 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label="建立时间" prop="createDate">
-        <el-input
-          v-model="queryParams.createDate"
-          placeholder="请输入建立时间"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="创建人" prop="createManId">
-        <el-input
-          v-model="queryParams.createManId"
-          placeholder="请输入创建人"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item :label="$t('checkStockCheck.warehouse')" prop="warehouseId"> <!-- 仓库 -->
         <el-select v-model="queryParams.warehouseId" :placeholder="$t('checkStockCheck.selectWarehouse')" clearable>
           <el-option
@@ -55,94 +39,6 @@
           />
         </el-select>
       </el-form-item>
-<!--      <el-form-item label=" 完成日期" prop="finishDate">
-        <el-input
-          v-model="queryParams.finishDate"
-          placeholder="请输入 完成日期"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="erp单号" prop="erpBill">
-        <el-input
-          v-model="queryParams.erpBill"
-          placeholder="请输入erp单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="单据来源" prop="stockSource">
-        <el-input
-          v-model="queryParams.stockSource"
-          placeholder="请输入单据来源"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户编码" prop="customerNo">
-        <el-input
-          v-model="queryParams.customerNo"
-          placeholder="请输入客户编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="班组编码" prop="classNo">
-        <el-input
-          v-model="queryParams.classNo"
-          placeholder="请输入班组编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="供应商编码" prop="supplierNo">
-        <el-input
-          v-model="queryParams.supplierNo"
-          placeholder="请输入供应商编码"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段1" prop="spare1">
-        <el-input
-          v-model="queryParams.spare1"
-          placeholder="请输入备用字段1"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段2" prop="spare2">
-        <el-input
-          v-model="queryParams.spare2"
-          placeholder="请输入备用字段2"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段3" prop="spare3">
-        <el-input
-          v-model="queryParams.spare3"
-          placeholder="请输入备用字段3"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段4" prop="spare4">
-        <el-input
-          v-model="queryParams.spare4"
-          placeholder="请输入备用字段4"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备用字段5" prop="spare5">
-        <el-input
-          v-model="queryParams.spare5"
-          placeholder="请输入备用字段5"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('checkStockCheck.search')}}</el-button> <!-- 搜索 -->
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('checkStockCheck.reset')}}</el-button> <!-- 重置 -->
@@ -606,7 +502,7 @@ export default {
         // 如果最终没有可用的出口选项，给出提示
         if (this.exitOptions.length === 0) {
           //console.warn('当前仓库没有可用的出口选项')
-          this.exitOptions=[{exitId: '0', exitName: '人工出口'}]
+          this.exitOptions=[{exitId: '0', exitName: this.$t('checkStockCheck.defaultExit')}]
         }
 
       } catch (error) {