fix:1.仓储库存单位转换记录和库存关联更新 2.原材料和非原材料的数量区分 3.入库和出库记录删除单位转换库存更新 4.过磅单单位转换更新

liding

6 天以前 df084ef7fc2f3b1a00790ed55616188b280f9594

fix:1.仓储库存单位转换记录和库存关联更新
2.原材料和非原材料的数量区分
3.入库和出库记录删除单位转换库存更新
4.过磅单单位转换更新

 src/views/inventoryManagement/dispatchLog/Record.vue

@@ -42,85 +42,106 @@
                :row-key="(row) => row.id"
                style="width: 100%"
                height="calc(100vh - 18.5em)"
                :fit="true"
            >
                <el-table-column align="center" type="selection" width="55" />
                <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column
            label="出库批次"
            prop="outboundBatches"
            min-width="100"
            show-overflow-tooltip
        />
                <el-table-column align="center" type="selection" min-width="55" fixed="left" />
                <el-table-column align="center" label="序号" type="index" min-width="60" fixed="left" />
                <el-table-column
                    label="出库日期"
                    prop="createTime"
                    label="产品类型"
                    prop="parentName"
                    min-width="100"
                    show-overflow-tooltip
                />
                <el-table-column
                    label="产品大类"
                    label="车牌号"
                    prop="licensePlateNo"
                    min-width="120"
                    show-overflow-tooltip
                />
                <el-table-column
                    label="产品名称"
                    prop="productName"
                    min-width="120"
                    show-overflow-tooltip
                />
                <el-table-column
                    label="规格型号"
                    prop="model"
                    min-width="150"
                    show-overflow-tooltip
                />
                <el-table-column
                    label="单位"
                    prop="unit"
                    show-overflow-tooltip
                />
                <!-- <el-table-column
                    label="出库数量"
                    prop="stockOutNum"
                    show-overflow-tooltip
                /> -->
                <el-table-column
                    label="车牌号"
                    prop="licensePlateNo"
                    min-width="100"
                    show-overflow-tooltip
                />
                <el-table-column
                    label="毛重"
                    prop="grossWeight"
                    min-width="100"
                    show-overflow-tooltip
                />
                <el-table-column
                    label="皮重"
                    prop="tareWeight"
                    min-width="100"
                    show-overflow-tooltip
                />
                <el-table-column
                    label="净重"
                    prop="netWeight"
                    min-width="100"
                    show-overflow-tooltip
                />
                <el-table-column
                    label="出库人"
                    prop="createBy"
                    label="单位"
                    prop="unit"
                    min-width="80"
                    show-overflow-tooltip
                />
        <el-table-column label="来源"
                         prop="recordType"
                         show-overflow-tooltip>
          <template #default="scope">
            {{ getRecordType(scope.row.recordType) }}
          </template>
        </el-table-column>
        <el-table-column
            label="过磅日期"
            prop="weighingDate"
            min-width="120"
            show-overflow-tooltip
        />
        <el-table-column
            label="过磅员"
            prop="weighingOperator"
            min-width="100"
            show-overflow-tooltip
        />
        <el-table-column label="操作"
                         width="260"
                         align="center">
                <el-table-column
                    label="出库人"
                    prop="createBy"
                    min-width="100"
                    show-overflow-tooltip
                />
        <el-table-column
            label="出库批次"
            prop="outboundBatches"
            min-width="150"
            show-overflow-tooltip
        />
        <el-table-column
            label="出库时间"
            prop="createTime"
            min-width="160"
            show-overflow-tooltip
        />
        <el-table-column label="来源"
                         prop="recordType"
                         min-width="100"
                         show-overflow-tooltip>
          <template #default="scope">
            {{ getRecordType(scope.row.recordType) }}
          </template>
        </el-table-column>
                <el-table-column label="操作"
                         min-width="200"
                         align="center"
                         fixed="right">
          <template #default="scope">
            <el-button
              v-if="scope.row.recordType === '0' && hasDispatchEdit"
@@ -129,13 +150,13 @@
              @click="handleEdit(scope.row)"
            >编辑</el-button>
            <el-button
              v-if="scope.row.recordType === '0'"
              v-if="scope.row.recordType === '0' && scope.row.parentName === '原材料'"
              type="primary"
              size="mini"
              @click="handlePreview(scope.row)"
            >导出过磅单</el-button>
          </template>
        </el-table-column>
                </el-table-column>
            </el-table>
      <el-dialog
        v-model="isShowEditModal"
@@ -144,109 +165,112 @@
        @close="closeEditModal"
      >
        <el-form label-width="140px" :model="editForm" label-position="top" ref="editFormRef">
          <!-- <el-form-item
            label="出库数量"
            prop="stockOutNum"
          >
            <el-input-number
              v-model="editForm.stockOutNum"
              :min="0"
              :step="1"
              :precision="0"
              controls-position="right"
              style="width: 100%"
              disabled
            />
          </el-form-item> -->

          

          <el-form-item
            label="车牌号"
            prop="licensePlateNo"
            :rules="[{ required: true, message: '请输入车牌号', trigger: ['blur','change'] }]"
          >
            <el-input v-model="editForm.licensePlateNo" />
          </el-form-item>
          <el-form-item
            label="单位"
            prop="unit"
          >
            <el-select
              v-model="editForm.unit"
              placeholder="请选择单位"
              style="width: 100%"
              clearable
          <!-- 非原材料显示出库数量 -->
          <template v-if="editForm.parentName !== '原材料'">
            <el-form-item
              label="出库数量"
              prop="stockOutNum"
            >
              <el-option label="吨" value="吨" />
              <el-option label="公斤" value="公斤" />
            </el-select>
          </el-form-item>
          <el-form-item
            label="毛重"
            prop="grossWeight"
            :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]"
          >
            <el-input-number
              v-model="editForm.grossWeight"
              :step="0.01"
              :min="0"
              style="width: 100%"
              @change="computeNetWeightEdit"
            />
          </el-form-item>
              <el-input-number
                v-model="editForm.stockOutNum"
                :min="0"
                :step="1"
                :precision="0"
                controls-position="right"
                style="width: 100%"
              />
            </el-form-item>
          </template>

          <el-form-item
            label="皮重"
            prop="tareWeight"
            :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
          >
            <el-input-number
              v-model="editForm.tareWeight"
              :step="0.01"
              :min="0"
              style="width: 100%"
              @change="computeNetWeightEdit"
            />
          </el-form-item>
          <!-- 原材料显示过磅相关字段 -->
          <template v-if="editForm.parentName === '原材料'">
            <el-form-item
              label="车牌号"
              prop="licensePlateNo"
              :rules="[{ required: true, message: '请输入车牌号', trigger: ['blur','change'] }]"
            >
              <el-input v-model="editForm.licensePlateNo" />
            </el-form-item>
            <el-form-item
              label="单位"
              prop="unit"
            >
              <el-select
                v-model="editForm.unit"
                placeholder="请选择单位"
                style="width: 100%"
                clearable
              >
                <el-option label="吨" value="吨" />
                <el-option label="公斤" value="公斤" />
              </el-select>
            </el-form-item>
            <el-form-item
              label="毛重"
              prop="grossWeight"
              :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]"
            >
              <el-input-number
                v-model="editForm.grossWeight"
                :step="0.01"
                :min="0"
                style="width: 100%"
                @change="computeNetWeightEdit"
              />
            </el-form-item>

          <el-form-item
            label="净重"
            prop="netWeight"
            :rules="[{ required: true, message: '净重由毛重和皮重自动计算', trigger: ['blur','change'] }]"
          >
            <el-input-number
              v-model="editForm.netWeight"
              :step="0.01"
              :min="0"
              style="width: 100%"
              disabled
            />
          </el-form-item>
            <el-form-item
              label="皮重"
              prop="tareWeight"
              :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
            >
              <el-input-number
                v-model="editForm.tareWeight"
                :step="0.01"
                :min="0"
                style="width: 100%"
                @change="computeNetWeightEdit"
              />
            </el-form-item>

          <el-form-item
            label="过磅日期"
            prop="weighingDate"
            :rules="[{ required: true, message: '请选择过磅日期', trigger: 'change' }]"
          >
            <el-date-picker
              style="width: 100%"
              v-model="editForm.weighingDate"
              value-format="YYYY-MM-DD HH:mm:ss"
              format="YYYY-MM-DD HH:mm:ss"
              type="datetime"
              placeholder="请选择过磅日期"
              clearable
            />
          </el-form-item>
            <el-form-item
              label="净重"
              prop="netWeight"
              :rules="[{ required: true, message: '净重由毛重和皮重自动计算', trigger: ['blur','change'] }]"
            >
              <el-input-number
                v-model="editForm.netWeight"
                :step="0.01"
                :min="0"
                style="width: 100%"
                disabled
              />
            </el-form-item>

          <el-form-item
            label="过磅员"
            prop="weighingOperator"
            :rules="[{ required: true, message: '请输入过磅员', trigger: ['blur','change'] }]"
          >
            <el-input v-model="editForm.weighingOperator" />
          </el-form-item>
            <el-form-item
              label="过磅日期"
              prop="weighingDate"
              :rules="[{ required: true, message: '请选择过磅日期', trigger: 'change' }]"
            >
              <el-date-picker
                style="width: 100%"
                v-model="editForm.weighingDate"
                value-format="YYYY-MM-DD HH:mm:ss"
                format="YYYY-MM-DD HH:mm:ss"
                type="datetime"
                placeholder="请选择过磅日期"
                clearable
              />
            </el-form-item>

            <el-form-item
              label="过磅员"
              prop="weighingOperator"
              :rules="[{ required: true, message: '请输入过磅员', trigger: ['blur','change'] }]"
            >
              <el-input v-model="editForm.weighingOperator" />
            </el-form-item>
          </template>
        </el-form>

        <template #footer>
@@ -414,8 +438,12 @@
const handleEditSubmit = () => {
  editFormRef.value?.validate?.((valid) => {
    if (!valid) return;
    const { stockOutNum, ...payload } = editForm.value || {};
    editStockOut(payload).then(() => {
    const submitData = {
      ...editForm.value,
      productType: editForm.value.parentName === '原材料' ? 0 : 1,
      netWeight: editForm.value.parentName === '原材料' ? editForm.value.netWeight : editForm.value.stockOutNum
    };
    editStockOut(submitData).then(() => {
      closeEditModal();
      proxy.$modal.msgSuccess("编辑成功");
      getList();

 src/views/inventoryManagement/receiptManagement/Record.vue

@@ -47,81 +47,98 @@
                :expand-row-keys="expandedRowKeys"
                :row-key="row => row.id"
                style="width: 100%"
                height="calc(100vh - 18.5em)">
                height="calc(100vh - 18.5em)"
                :fit="true">
        <el-table-column align="center"
                         type="selection"
                         width="55"/>
                         min-width="55"
                         fixed="left"/>
        <el-table-column align="center"
                         label="序号"
                         type="index"
                         width="60"/>
                         min-width="60"
                         fixed="left"/>
        <el-table-column label="产品类型"
                         prop="productType"
                         width="100"
                         prop="parentName"
                         min-width="100"
                         show-overflow-tooltip/>
        <el-table-column label="入库批次"
                         prop="inboundBatches"
                         width="280"
                         show-overflow-tooltip/>
        <el-table-column label="入库时间"
                         prop="createTime"
                         show-overflow-tooltip/>
        <el-table-column label="产品大类"
                         prop="productName"
                         show-overflow-tooltip/>
        <el-table-column label="规格型号"
                         prop="model"
                         show-overflow-tooltip/>
        <el-table-column label="单位"
                         prop="unit"
                         show-overflow-tooltip/>
        <!-- <el-table-column label="入库数量"
                         prop="stockInNum"
                         show-overflow-tooltip/> -->
        <el-table-column label="车牌号"
                         prop="licensePlateNo"
                         v-if="type === '0'"
                         min-width="120"
                         show-overflow-tooltip/>
        <el-table-column label="产品名称"
                         prop="productName"
                         min-width="120"
                         show-overflow-tooltip/>
        <el-table-column label="规格型号"
                         prop="model"
                         min-width="150"
                         show-overflow-tooltip/>
        <el-table-column label="入库数量"
                         prop="stockInNum"
                         min-width="100"
                         show-overflow-tooltip/>
        <el-table-column label="毛重"
                         prop="grossWeight"
                         v-if="type === '0'"
                         min-width="100"
                         show-overflow-tooltip/>
        <el-table-column label="皮重"
                         prop="tareWeight"
                         v-if="type === '0'"
                         min-width="100"
                         show-overflow-tooltip/>
        <el-table-column label="净重"
                         prop="netWeight"
                         v-if="type === '0'"
                         min-width="100"
                         show-overflow-tooltip/>
        <el-table-column label="单位"
                         prop="unit"
                         min-width="80"
                         show-overflow-tooltip/>
        <el-table-column label="过磅日期"
                         prop="weighingDate"
                         v-if="type === '0'"
                         min-width="160"
                         show-overflow-tooltip/>
        <el-table-column label="过磅员"
                         prop="weighingOperator"
                         v-if="type === '0'"
                         min-width="100"
                         show-overflow-tooltip/>
        <el-table-column label="入库人"
                         prop="createBy"
                         min-width="100"
                         show-overflow-tooltip/>
        <el-table-column label="入库时间"
                         prop="createTime"
                         min-width="160"
                         show-overflow-tooltip/>
        <el-table-column label="入库批次"
                         prop="inboundBatches"
                         min-width="150"
                         show-overflow-tooltip/>
        <el-table-column label="来源"
                         prop="recordType"
                         min-width="100"
                         show-overflow-tooltip>
          <template #default="scope">
            {{ getRecordType(scope.row.recordType) }}
          </template>
        </el-table-column>
        <el-table-column label="过磅日期"
                         prop="weighingDate"
                         v-if="type === '0'"
                         show-overflow-tooltip/>
        <el-table-column label="过磅员"
                         prop="weighingOperator"
                         v-if="type === '0'"
                         show-overflow-tooltip/>
        <el-table-column label="操作"
                         width="260"
                         align="center">
                         min-width="200"
                         align="center"
                         fixed="right">
          <template #default="scope">
            <el-button v-if="scope.row.recordType === '0' && hasReceiptEdit"
              type="primary"
              size="mini"
              @click="handleEdit(scope.row)"
            >编辑</el-button>
            <el-button v-if="scope.row.recordType === '0'"
            <el-button v-if="scope.row.recordType === '0' && scope.row.parentName === '原材料'"
                       type="primary"
                       size="mini"
                       @click="handlePreview(scope.row)">导出过磅单</el-button>
@@ -135,24 +152,25 @@
        @close="closeEditModal"
      >
        <el-form label-width="140px" :model="editForm" label-position="top" ref="editFormRef">
          <!-- <el-form-item
            label="入库数量"
            prop="stockInNum"
          >
            <el-input-number
              v-model="editForm.stockInNum"
              :min="0"
              :step="1"
              :precision="0"
              controls-position="right"
              style="width: 100%"
              disabled
            />
          </el-form-item> -->
          <!-- 原材料显示入库数量 -->
          <template v-if="editForm.parentName !== '原材料'">
            <el-form-item
              label="入库数量"
              prop="stockInNum"
            >
              <el-input-number
                v-model="editForm.stockInNum"
                :min="0"
                :step="1"
                :precision="0"
                controls-position="right"
                style="width: 100%"
              />
            </el-form-item>
          </template>

          <template v-if="type === '0'">
            

          <!-- 非原材料显示过磅相关字段 -->
          <template v-if="type === '0' && editForm.parentName === '原材料'">
            <el-form-item
              label="车牌号"
              prop="licensePlateNo"
@@ -409,7 +427,12 @@
const handleEditSubmit = () => {
  editFormRef.value?.validate?.((valid) => {
    if (!valid) return;
    editStockInStock(editForm.value).then(() => {
    const submitData = {
      ...editForm.value,
      productType: editForm.value.parentName === '原材料' ? 0 : 1,
      netWeight: editForm.value.parentName === '原材料' ? editForm.value.netWeight : editForm.value.stockInNum
    };
    editStockInStock(submitData).then(() => {
      closeEditModal();
      proxy.$modal.msgSuccess("编辑成功");
      getList();

 src/views/inventoryManagement/stockManagement/Qualified.vue

@@ -143,7 +143,10 @@
// 点击领用
const showSubtractModal = (row) => {
  console.log('row', row)
  record.value = row
  record.value = {
    ...row,
    productType: row.parentName === '原材料' ? 0 : 1
  }
  isShowSubtractModal.value = true
}


 src/views/inventoryManagement/stockManagement/Subtract.vue

@@ -30,92 +30,115 @@
          <el-input v-model="formState.model"  disabled />
        </el-form-item>

        <!-- 非原材料显示数量字段 -->
        <el-form-item
            label="车牌号"
            prop="licensePlateNo"
            :rules="[{ required: true, message: '请输入车牌号', trigger: ['blur','change'] }]"
            v-if="props.record.productType !== 0"
            label="数量"
            prop="qualitity"
            :rules="[
              { required: true, message: '请输入数量', trigger: ['blur', 'change'] }
            ]"
        >
          <el-input v-model="formState.licensePlateNo" />
        </el-form-item>
        <el-form-item
            label="单位"
            prop="unit"
        >
          <el-select
              v-model="formState.unit"
              placeholder="请选择单位"
          <el-input-number
              v-model="formState.qualitity"
              :min="0"
              :step="1"
              :precision="0"
              style="width: 100%"
              clearable
              controls-position="right"
              placeholder="请输入数量"
          />
        </el-form-item>

        <!-- 原材料显示过磅相关字段 -->
        <template v-if="props.record.productType === 0">
          <el-form-item
              label="车牌号"
              prop="licensePlateNo"
              :rules="[{ required: true, message: '请输入车牌号', trigger: ['blur','change'] }]"
          >
            <el-option label="吨" value="吨" />
            <el-option label="公斤" value="公斤" />
          </el-select>
        </el-form-item>
        <el-form-item
            label="毛重"
            prop="grossWeight"
            :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]"
        >
          <el-input-number
              v-model="formState.grossWeight"
              :step="0.01"
              :min="0"
              style="width: 100%"
              @change="computeNetWeight"
          />
        </el-form-item>
            <el-input v-model="formState.licensePlateNo" />
          </el-form-item>
          <el-form-item
              label="单位"
              prop="unit"
          >
            <el-select
                v-model="formState.unit"
                placeholder="请选择单位"
                style="width: 100%"
                clearable
            >
              <el-option label="吨" value="吨" />
              <el-option label="公斤" value="公斤" />
            </el-select>
          </el-form-item>
          <el-form-item
              label="毛重"
              prop="grossWeight"
              :rules="[{ required: true, message: '请输入毛重', trigger: ['blur','change'] }]"
          >
            <el-input-number
                v-model="formState.grossWeight"
                :step="0.01"
                :min="0"
                style="width: 100%"
                @change="computeNetWeight"
            />
          </el-form-item>

        <el-form-item
            label="皮重"
            prop="tareWeight"
            :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
        >
          <el-input-number
              v-model="formState.tareWeight"
              :step="0.01"
              :min="0"
              style="width: 100%"
              @change="computeNetWeight"
          />
        </el-form-item>
          <el-form-item
              label="皮重"
              prop="tareWeight"
              :rules="[{ required: true, message: '请输入皮重', trigger: ['blur','change'] }]"
          >
            <el-input-number
                v-model="formState.tareWeight"
                :step="0.01"
                :min="0"
                style="width: 100%"
                @change="computeNetWeight"
            />
          </el-form-item>

        <el-form-item
            label="净重"
            prop="netWeight"
            :rules="[{ required: true, message: '净重由毛重和皮重自动计算', trigger: ['blur','change'] }]"
        >
          <el-input-number
              v-model="formState.netWeight"
              :step="0.01"
              :min="0"
              style="width: 100%"
              disabled
          />
        </el-form-item>
          <el-form-item
              label="净重"
              prop="netWeight"
              :rules="[{ required: true, message: '净重由毛重和皮重自动计算', trigger: ['blur','change'] }]"
          >
            <el-input-number
                v-model="formState.netWeight"
                :step="0.01"
                :min="0"
                style="width: 100%"
                disabled
            />
          </el-form-item>

        <el-form-item
            label="过磅日期"
            prop="weighingDate"
            :rules="[{ required: true, message: '请选择过磅日期', trigger: 'change' }]"
        >
          <el-date-picker
              style="width: 100%"
              v-model="formState.weighingDate"
              value-format="YYYY-MM-DD HH:mm:ss"
              format="YYYY-MM-DD HH:mm:ss"
              type="datetime"
              placeholder="请选择过磅日期"
              clearable
          />
        </el-form-item>
          <el-form-item
              label="过磅日期"
              prop="weighingDate"
              :rules="[{ required: true, message: '请选择过磅日期', trigger: 'change' }]"
          >
            <el-date-picker
                style="width: 100%"
                v-model="formState.weighingDate"
                value-format="YYYY-MM-DD HH:mm:ss"
                format="YYYY-MM-DD HH:mm:ss"
                type="datetime"
                placeholder="请选择过磅日期"
                clearable
            />
          </el-form-item>

        <el-form-item
            label="过磅员"
            prop="weighingOperator"
            :rules="[{ required: true, message: '请输入过磅员', trigger: ['blur','change'] }]"
        >
          <el-input v-model="formState.weighingOperator" />
        </el-form-item>
          <el-form-item
              label="过磅员"
              prop="weighingOperator"
              :rules="[{ required: true, message: '请输入过磅员', trigger: ['blur','change'] }]"
          >
            <el-input v-model="formState.weighingOperator" />
          </el-form-item>
        </template>

        <el-form-item label="备注" prop="remark">
          <el-input v-model="formState.remark" type="textarea" />

 src/views/inventoryManagement/stockReport/index.vue

@@ -176,7 +176,7 @@
             v-if="searchForm.reportType !== 'inout'"
           />
           <el-table-column
             label="产品大类"
             label="产品名称"
             prop="productName"
             show-overflow-tooltip
           />