已完成已作废的作业不能再次操作，主子表刷新问题，导出字典国际化

2025-08-21 11:22:13 +08:00
parent a6c83092c7
commit ae9b0f3660
30 changed files with 1511 additions and 591 deletions
--- a/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
+++ b/ruoyi-ui/src/views/search/ViewStockinHistory/index.vue
@@ -37,24 +37,34 @@
          />
        </el-select>
      </el-form-item>
-      <el-form-item :label="$t('searchViewStockinHistory.createDate')" prop="createDate"> <!-- 创建时间 -->
-        <el-date-picker
-          v-model="queryParams.createDate"
-          type="date"
-          :placeholder="$t('searchViewStockinHistory.selectCreateDate')"
-          value-format="yyyy-MM-dd"
-          clearable
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockinHistory.finishDate')" prop="finishDate"> <!-- 完成时间 -->
-        <el-date-picker
-          v-model="queryParams.finishDate"
-          type="date"
-          :placeholder="$t('searchViewStockinHistory.selectFinishDate')"
-          value-format="yyyy-MM-dd"
-          clearable
-        />
+      <el-form-item :label="$t('searchViewStockinHistory.status')" prop="status"> <!-- 单据状态 -->
+        <el-select v-model="queryParams.status" :placeholder="$t('searchViewStockinHistory.selectStatus')" clearable>
+          <el-option
+            v-for="dict in dict.type.in_bill_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
      </el-form-item>
+<!--      <el-form-item :label="$t('searchViewStockinHistory.createDate')" prop="createDate"> &lt;!&ndash; 创建时间 &ndash;&gt;-->
+<!--        <el-date-picker-->
+<!--          v-model="queryParams.createDate"-->
+<!--          type="date"-->
+<!--          :placeholder="$t('searchViewStockinHistory.selectCreateDate')"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          clearable-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="$t('searchViewStockinHistory.finishDate')" prop="finishDate"> &lt;!&ndash; 完成时间 &ndash;&gt;-->
+<!--        <el-date-picker-->
+<!--          v-model="queryParams.finishDate"-->
+<!--          type="date"-->
+<!--          :placeholder="$t('searchViewStockinHistory.selectFinishDate')"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          clearable-->
+<!--        />-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="创建人" prop="createManId">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.createManId"-->
@@ -82,14 +92,14 @@
 <!--        />-->
 <!--      </el-form-item>-->

-      <el-form-item :label="$t('searchViewStockinHistory.erpBill')" prop="erpBill" style="white-space: nowrap"> <!-- ERP单号 -->
-        <el-input
-          v-model="queryParams.erpBill"
-          :placeholder="$t('searchViewStockinHistory.inputErpBill')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item :label="$t('searchViewStockinHistory.erpBill')" prop="erpBill" style="white-space: nowrap"> &lt;!&ndash; ERP单号 &ndash;&gt;-->
+<!--        <el-input-->
+<!--          v-model="queryParams.erpBill"-->
+<!--          :placeholder="$t('searchViewStockinHistory.inputErpBill')"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="单据来源" prop="stockSource">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.stockSource"-->
@@ -106,22 +116,22 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item :label="$t('searchViewStockinHistory.supplierNo')" prop="supplierNo" style="white-space: nowrap"> <!-- 供应商编号 -->
-        <el-input
-          v-model="queryParams.supplierNo"
-          :placeholder="$t('searchViewStockinHistory.inputSupplierNo')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockinHistory.supplierName')" prop="supplierName" style="white-space: nowrap"> <!-- 供应商名称 -->
-        <el-input
-          v-model="queryParams.supplierName"
-          :placeholder="$t('searchViewStockinHistory.inputSupplierName')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item :label="$t('searchViewStockinHistory.supplierNo')" prop="supplierNo" style="white-space: nowrap"> &lt;!&ndash; 供应商编号 &ndash;&gt;-->
+<!--        <el-input-->
+<!--          v-model="queryParams.supplierNo"-->
+<!--          :placeholder="$t('searchViewStockinHistory.inputSupplierNo')"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="$t('searchViewStockinHistory.supplierName')" prop="supplierName" style="white-space: nowrap"> &lt;!&ndash; 供应商名称 &ndash;&gt;-->
+<!--        <el-input-->
+<!--          v-model="queryParams.supplierName"-->
+<!--          :placeholder="$t('searchViewStockinHistory.inputSupplierName')"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="供应商简称" prop="simpleName">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.simpleName"-->
@@ -162,22 +172,22 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item :label="$t('searchViewStockinHistory.lotNo')" prop="lotNo"> <!-- 批次号 -->
-        <el-input
-          v-model="queryParams.lotNo"
-          :placeholder="$t('searchViewStockinHistory.inputLotNo')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item :label="$t('searchViewStockinHistory.printDate')" prop="printDate"> <!-- 入库日期 -->
-        <el-date-picker clearable
-          v-model="queryParams.printDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          :placeholder="$t('searchViewStockinHistory.selectPrintDate')">
-        </el-date-picker>
-      </el-form-item>
+<!--      <el-form-item :label="$t('searchViewStockinHistory.lotNo')" prop="lotNo"> &lt;!&ndash; 批次号 &ndash;&gt;-->
+<!--        <el-input-->
+<!--          v-model="queryParams.lotNo"-->
+<!--          :placeholder="$t('searchViewStockinHistory.inputLotNo')"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item :label="$t('searchViewStockinHistory.printDate')" prop="printDate"> &lt;!&ndash; 入库日期 &ndash;&gt;-->
+<!--        <el-date-picker clearable-->
+<!--          v-model="queryParams.printDate"-->
+<!--          type="date"-->
+<!--          value-format="yyyy-MM-dd"-->
+<!--          :placeholder="$t('searchViewStockinHistory.selectPrintDate')">-->
+<!--        </el-date-picker>-->
+<!--      </el-form-item>-->
      <el-form-item :label="$t('searchViewStockinHistory.stockStatus')" prop="stockStatus"> <!-- 库存状态 -->
        <el-select v-model="queryParams.stockStatus" :placeholder="$t('searchViewStockinHistory.selectStockStatus')" clearable>
          <el-option
@@ -236,14 +246,14 @@
 <!--          @keyup.enter.native="handleQuery"-->
 <!--        />-->
 <!--      </el-form-item>-->
-      <el-form-item :label="$t('searchViewStockinHistory.spec')" prop="spec"> <!-- 规格 -->
-        <el-input
-          v-model="queryParams.spec"
-          :placeholder="$t('searchViewStockinHistory.inputSpec')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item :label="$t('searchViewStockinHistory.spec')" prop="spec"> &lt;!&ndash; 规格 &ndash;&gt;-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spec"-->
+<!--          :placeholder="$t('searchViewStockinHistory.inputSpec')"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('searchViewStockinHistory.search')}}</el-button> <!-- 搜索 -->
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('searchViewStockinHistory.reset')}}</el-button> <!-- 重置 -->