Merge branch 'dev_天津_阳光印刷' of http://114.132.189.42:9002/r/product-inventor...

张诺

4 天以前 e5a70efeaa9fd96ce1242e5d582c8237319fade4

 src/views/inventoryManagement/stockManagement/New.vue

@@ -6,47 +6,115 @@
        width="800"
        @close="closeModal"
    >
      <el-form label-width="140px" :model="formState" label-position="top" ref="formRef">
        <el-form-item
            label="产品名称"
            prop="productModelId"
            :rules="[
                {
                required: true,
                message: '请选择产品',
                trigger: 'change',
              }
            ]"
        >
          <el-button type="primary" @click="showProductSelectDialog = true">
            {{ formState.productName ? formState.productName : '选择产品' }}
          </el-button>
        </el-form-item>
      <el-form label-width="140px" :model="formState" :rules="rules" label-position="top" ref="formRef">
        <el-row :gutter="16">
          <el-col :xs="24" :sm="12">
            <el-form-item
                label="产品名称"
                prop="productModelId"
                :rules="[
                    {
                    required: true,
                    message: '请选择产品',
                    trigger: 'change',
                  }
                ]"
            >
              <el-button type="primary" @click="showProductSelectDialog = true">
                {{ formState.productName ? formState.productName : '选择产品' }}
              </el-button>
            </el-form-item>
          </el-col>

        <el-form-item
            label="规格"
            prop="productModelName"
        >
          <el-input v-model="formState.productModelName"  disabled />
        </el-form-item>
          <el-col :xs="24" :sm="12">
            <el-form-item
                label="规格"
                prop="productModelName"
            >
              <el-input v-model="formState.productModelName" disabled />
            </el-form-item>
          </el-col>

        <el-form-item
            label="单位"
            prop="unit"
        >
          <el-input v-model="formState.unit"  disabled />
        </el-form-item>
          <el-col :xs="24" :sm="12">
            <el-form-item
                label="单位(主)"
                prop="unit"
            >
              <el-input v-model="formState.unit" disabled />
            </el-form-item>
          </el-col>

        <el-form-item
            label="数量"
            prop="qualitity"
        >
          <el-input-number v-model="formState.qualitity" :step="1" :min="0" style="width: 100%" />
        </el-form-item>
          <el-col :xs="24" :sm="12">
            <el-form-item
                label="单位(辅)"
                prop="subUnit"
            >
              <el-input v-model="formState.subUnit" disabled />
            </el-form-item>
          </el-col>

        <el-form-item label="备注" prop="remark">
          <el-input v-model="formState.remark" type="textarea" />
        </el-form-item>
          <el-col :xs="24" :sm="12">
            <el-form-item
                label="仓库编码"
                prop="warehouseCode"
            >
              <el-select v-model="formState.warehouseCode" :options="warehouseCode" placeholder="请选择仓库编码" @change="handleWarehouseSelect">
                <el-option v-for="item in warehouseCode" :key="item.value" :label="item.value" :value="item.value" />
              </el-select>
            </el-form-item>
          </el-col>

          <el-col :xs="24" :sm="12">
            <el-form-item
                label="仓库名称"
                prop="warehouseName"
            >
              <el-input v-model="formState.warehouseName" disabled />
            </el-form-item>
          </el-col>

          <el-col :xs="24" :sm="12">
            <el-form-item
                label="存货编码"
                prop="productCode"
            >
              <el-input v-model="formState.productCode" />
            </el-form-item>
          </el-col>

          <el-col :xs="24" :sm="12">
            <el-form-item
                label="库存(主)数量"
                prop="qualitity"
            >
              <el-input-number v-model="formState.qualitity" :step="1" :min="1" style="width: 100%" />
            </el-form-item>
          </el-col>

          <el-col :xs="24" :sm="12">
            <el-form-item
                label="库存(辅)数量"
                prop="subQualitity"
            >
              <el-input-number v-model="formState.subQualitity" :step="1" :min="1" style="width: 100%" />
            </el-form-item>
          </el-col>

          <el-col :xs="24" :sm="12" v-if="type === 'qualified'">
            <el-form-item
                label="库存预警数量"
                prop="warnNum"
            >
              <el-input-number v-model="formState.warnNum" :step="1" :min="0" :max="formState.qualitity" style="width: 100%" />
            </el-form-item>
          </el-col>

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

      <!-- 产品选择弹窗 -->
@@ -69,11 +137,25 @@
import {ref, computed, getCurrentInstance} from "vue";
import ProductSelectDialog from "@/views/basicData/product/ProductSelectDialog.vue";
import {createStockInventory} from "@/api/inventoryManagement/stockInventory.js";
import {createStockUnInventory} from "@/api/inventoryManagement/stockUninventory.js";
const { proxy } = getCurrentInstance();
// 获取字典
const { warehouse_code } = proxy.useDict(
  "warehouse_code"
);

const warehouseCode = computed(() => warehouse_code?.value || []);// 控制弹窗显示

const props = defineProps({
  visible: {
    type: Boolean,
    required: true,
  },

  type: {
    type: String,
    required: true,
    default: 'qualified',
  },
});

@@ -86,8 +168,24 @@
  productName: "",
  productModelName: "",
  unit: "",
  subUnit: "",
  productCode: "",
  warehouseCode: "",
  warehouseName: "",
  qualitity: 0,
  warnNum: 0,
  subQualitity: 0,
  remark: '',
});

// 表单验证规则
const rules = ref({
  warehouseCode: [
    { required: true, message: '请选择仓库编码', trigger: 'change' },
  ],
  productCode: [
    { required: true, message: '请输入库存数量', trigger: 'blur' },
  ],
});

const isShow = computed({
@@ -101,8 +199,6 @@

const showProductSelectDialog = ref(false);

let { proxy } = getCurrentInstance()

const closeModal = () => {
  // 重置表单数据
  formState.value = {
@@ -110,21 +206,43 @@
    productModelId: undefined,
    productName: "",
    productModelName: "",
    description: '',
    unit: "",
    subUnit: "",
    qualitity: 0,
    productCode: "",
    warehouseCode: "",
    warehouseName: "",
    warnNum: 0,
    subQualitity: 0,
    remark: '',
  };
  isShow.value = false;
};

// 仓库选择处理
const handleWarehouseSelect = (val) => {
  if (val) {
    console.log(val);
    // 过滤出来warehouseCode
    warehouseCode.value.find(item => {
      if(item.value == val){
        formState.value.warehouseName = item.label;
      }
    })
  }
}


// 产品选择处理
const handleProductSelect = async (products) => {
  if (products && products.length > 0) {
    const product = products[0];
    console.log(product)
    formState.value.productId = product.productId;
    formState.value.productName = product.productName;
    formState.value.productModelName = product.model;
    formState.value.productModelId = product.id;
    formState.value.unit = product.unit;
    formState.value.subUnit = product.subUnit;
    showProductSelectDialog.value = false;
    // 触发表单验证更新
    proxy.$refs["formRef"]?.validateField('productModelId');
@@ -143,13 +261,24 @@
        proxy.$modal.msgError("请选择规格");
        return;
      }
      createStockInventory(formState.value).then(res => {
        // 关闭模态框
        isShow.value = false;
        // 告知父组件已完成
        emit('completed');
        proxy.$modal.msgSuccess("提交成功");
      })
      if (props.type === 'qualified') {
        createStockInventory(formState.value).then(res => {
          // 关闭模态框
          isShow.value = false;
          // 告知父组件已完成
          emit('completed');
          proxy.$modal.msgSuccess("提交成功");
        })
      } else {
        createStockUnInventory(formState.value).then(res => {
          // 关闭模态框
          isShow.value = false;
          // 告知父组件已完成
          emit('completed');
          proxy.$modal.msgSuccess("提交成功");
        })
      }

    }
  })
};