平库盘点页面,盘点差异页面展示

2025-06-30 16:42:43 +08:00
parent ace9f89b3f
commit 1804b7c34b
8 changed files with 113 additions and 25 deletions
--- a/ruoyi-ui/src/lang/en.js
+++ b/ruoyi-ui/src/lang/en.js
@@ -622,7 +622,8 @@ export default {
    inputCustomer: 'Please enter customer',
    inputOldQuantity: 'Please enter original value',
    inputNewQuantity: 'Please enter new value',
-    inputProductGuid: 'Please enter product GUID'
+    inputProductGuid: 'Please enter product GUID',
+    inputRecordType:'Please select RecordType'
  },
  // ********************库存信息*************
  stockManagement: {
@@ -688,7 +689,8 @@ export default {
    volume:'volume',
    cargoSpaceStatus: 'cargoSpaceStatus',
    cargoSpaceStockStatus: 'cargoSpaceStockStatus',
-    inputMaterialDesc: 'inputMaterialDesc'
+    inputMaterialDesc: 'inputMaterialDesc',
+    deleteConfirm:"deleteStock"

  },

--- a/ruoyi-ui/src/lang/zh.js
+++ b/ruoyi-ui/src/lang/zh.js
@@ -584,7 +584,7 @@ export default {
    productGuid: '物料guid',
    operation: '操作',
    edit: '修改',
-    delete: '删除',
+    delete: '审核未通过',
    search: '搜索',
    reset: '重置',
    confirm: '确定',
@@ -599,7 +599,8 @@ export default {
    inputCustomer: '请输入客户',
    inputOldQuantity: '请输入原值',
    inputNewQuantity: '请输入新值',
-    inputProductGuid: '请输入物料guid'
+    inputProductGuid: '请输入物料guid',
+    inputRecordType:'请选择操作方式'
  },
  // ********************库存信息*************
  stockManagement: {
@@ -667,8 +668,8 @@ export default {
    volume:'体积',
    productId:'物料编码',
    cargoSpaceStatus: '锁定状态',
-    cargoSpaceStockStatus: '货位状态'
-
+    cargoSpaceStockStatus: '货位状态',
+    deleteConfirm:"删除库存"

  },

--- a/ruoyi-ui/src/views/check/difference/index.vue
+++ b/ruoyi-ui/src/views/check/difference/index.vue
@@ -41,14 +41,14 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
-      <el-form-item :label="$t('checkDifference.lotNo')" prop="lotNo"> <!-- 批次号 -->
+<!--      <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>-->
 <!--      <el-form-item label="供应商" prop="supplier">
        <el-input
          v-model="queryParams.supplier"
@@ -98,8 +98,22 @@
      </el-form-item>
      <el-form-item :label="$t('checkDifference.status')" prop="status"> <!-- 审核状态 -->
        <el-select v-model="queryParams.status" :placeholder="$t('checkDifference.inputStatus')" clearable>
-          <el-option :label="$t('checkDifference.unaudited')" value="0" /> <!-- 未审核 -->
-          <el-option :label="$t('checkDifference.audited')" value="1" /> <!-- 已审核 -->
+          <el-option
+            v-for="dict in dict.type.audit_diff_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('checkDifference.recordType')" prop="recordType"> <!-- 审核状态 -->
+        <el-select v-model="queryParams.recordType" :placeholder="$t('checkDifference.inputRecordType')" clearable>
+          <el-option
+            v-for="dict in dict.type.record_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
        </el-select>
      </el-form-item>
      <!-- <el-form-item :label="$t('checkDifference.productGuid')" prop="productGuid"> 物料guid
@@ -128,28 +142,43 @@
          v-hasPermi="['check:difference:audit']"
        >{{$t('checkDifference.audit')}}</el-button>
      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple || queryParams.status === '1'"
+          @click="handleDelete"
+          v-hasPermi="['check:difference:delete']"
+        >{{$t('checkDifference.delete')}}</el-button>
+      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="differenceList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
 <!--      <el-table-column :label="$t('checkDifference.checkGuid')" align="center" prop="checkGuid" /> &lt;!&ndash; 盘点id &ndash;&gt;-->
+      <el-table-column :label="$t('checkDifference.warehouseId')" align="center" prop="warehouseName" /> <!-- 仓库 -->
      <el-table-column :label="$t('checkDifference.checkStockDetailId')" align="center" prop="checkStockDetailId" /> <!-- 盘点单据id -->
      <el-table-column :label="$t('checkDifference.stockId')" align="center" prop="stockId" /> <!-- 库存id -->
      <el-table-column :label="$t('checkDifference.trayCode')" align="center" prop="trayCode" /> <!-- 托盘 -->
-      <el-table-column :label="$t('checkDifference.cargoSpaceId')" align="center" prop="cargoSpaceId" /> <!-- 货位id -->
+      <el-table-column :label="$t('checkDifference.cargoSpaceId')" align="center" prop="cargoSpaceName" /> <!-- 货位id -->
      <el-table-column :label="$t('checkDifference.productId')" align="center" prop="productId" /> <!-- 物料id -->
-      <el-table-column :label="$t('checkDifference.lotNo')" align="center" prop="lotNo" /> <!-- 批次号 -->
-      <el-table-column :label="$t('checkDifference.supplier')" align="center" prop="supplier" /> <!-- 供应商 -->
-      <el-table-column :label="$t('checkDifference.customer')" align="center" prop="customer" /> <!-- 客户 -->
+      <el-table-column :label="$t('checkStockCheck.materialDesc')" align="center" prop="extraField.materialDesc"/> <!-- 物料描述 -->
+      <el-table-column :label="$t('checkStockCheck.englishDesc')" align="center" prop="extraField.englishDesc"/> <!-- 英文描述 -->
      <el-table-column :label="$t('checkDifference.oldQuantity')" align="center" prop="oldQuantity" /> <!-- 原值 -->
      <el-table-column :label="$t('checkDifference.newQuantity')" align="center" prop="newQuantity" /> <!-- 新值 -->
-      <el-table-column :label="$t('checkDifference.recordType')" align="center" prop="recordType" /> <!-- 操作方式 -->
-      <el-table-column :label="$t('checkDifference.createTime')" align="center" prop="createTime" /> <!-- 创建时间 -->
-      <el-table-column :label="$t('checkDifference.warehouseId')" align="center" prop="warehouseName" /> <!-- 创建时间 -->
-      <el-table-column :label="$t('checkDifference.status')" align="center" prop="status"> <!-- 审核状态 -->
+      <el-table-column :label="$t('checkDifference.recordType')" align="center" prop="recordType" >
        <template slot-scope="scope">
-          <dict-tag :options="[{ label: $t('checkDifference.unaudited'), value: '0', raw: { listClass: 'info' } }, { label: $t('checkDifference.audited'), value: '1', raw: { listClass: 'success' } }]" :value="scope.row.status"/>
+          <dict-tag :options="dict.type.record_type" :value="scope.row.recordType"/>
+        </template>
+      </el-table-column><!-- 操作方式 -->
+      <el-table-column :label="$t('checkDifference.createTime')" align="center" prop="createTime" /> <!-- 创建时间 -->
+      <el-table-column :label="$t('checkDifference.status')" align="center" prop="status"> <!-- 审核状态 -->
+
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.audit_diff_status" :value="scope.row.status"/>
        </template>
      </el-table-column>

@@ -236,6 +265,7 @@ import {listWarehouse} from "@/api/bas/warehouse";

 export default {
  name: "Difference",
+  dicts:['record_type','audit_diff_status'],
  components: {
    DictTag
  },
--- a/ruoyi-ui/src/views/check/flat/index.vue
+++ b/ruoyi-ui/src/views/check/flat/index.vue
@@ -37,7 +37,7 @@
          />
        </el-select>
      </el-form-item>-->
-      <el-form-item :label="$t('stockManagement.productStatus')" prop="productStatus"><!-- 物料状态 -->
+<!--      <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"
@@ -46,7 +46,7 @@
            :value="dict.value"
          />
        </el-select>
-      </el-form-item>
+      </el-form-item>-->
      <el-form-item :label="$t('stockManagement.inDate')" prop="inDate"><!-- 入库时间 -->
        <el-input
          v-model="queryParams.inDate"
@@ -602,6 +602,7 @@ export default {
    handleUpdate(row) {
      this.resetEdit()
      const stockId = row.stockId || this.ids
+      console.log(stockId)
      getManagement(stockId).then(response => {
        this.editForm = response.data
        this.editOpen = true
@@ -651,15 +652,17 @@ export default {
    },
    /** 删除按钮操作 */
    handleDelete(row) {
+      const stockId = row.stockId || this.ids[0]
      this.$modal.confirm(this.$t('stockManagement.deleteConfirm')).then(function() {
        //删除
        const pdData = {
-          stockId: row.stockId,
+          stockId: stockId,
          oldQuantity: row.quantity,
          warehouseId: row.warehouseId,
          productId: row.productId,
          recordType: 3
        }
+        console.log(pdData)
        return addDifference(pdData);
      }).then(() => {
        this.$modal.msgSuccess(this.$t('stockManagement.deleteSuccess'))