入库 新增编辑修改

入库 新增编辑修改

mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue

@@ -60,8 +60,8 @@
             <el-row>
               <el-col :span="24">
                 <el-form-item prop="level" label="入库仓库">
-                  <el-select v-model="formData.whId" placeholder="下拉选择" clearable class="!w-400px">
+                  <el-select v-model="formData.whId" placeholder="下拉选择" clearable class="!w-400px" @change="handleWh">
-                    <el-option v-for="dict in warehouseList" :key="dict.value" :label="dict.label" :value="dict.value" />
+                    <el-option v-for="dict in warehouseList" :key="dict.id" :label="dict.whName" :value="dict.id" />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -91,59 +91,68 @@
               </el-col>
               <el-table :data="formData.productBomItemDOList" class="hl-table" @cell-click="handleCellClick"
                 @cell-blur="handleCellBlur">
-                <el-table-column prop="" label="序号" />
+                <el-table-column prop="id" label="序号" :width="80" />
-                <el-table-column prop="projectName" label="物料编码">
+                <el-table-column prop="matCode" label="物料编码" required>
                   <template #default="scope">
-                    <el-input v-model="scope.row.projectName" :disabled="!scope.row.editable" />
+                    <el-select v-model="scope.row.matCode" placeholder="物料编码" :remote-method="remoteMatCodeSearch"
+                      remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading" @change="handleMatCode(scope)"
+                      class="!w-180px">
+                      <el-option v-for="item in matList" :key="item.id" :label="item.code" :value="item.id" />
+                    </el-select>
                   </template>
                 </el-table-column>
-                <el-table-column prop="name" label="物料名称">
+                <el-table-column prop="matName" label="物料名称" >
-                  <template #default="scope">
+                  <!-- <template #default="scope">
-                    <el-input v-model="scope.row.name" @click="openshoopname(scope.$index)"
+                    <el-input v-model="scope.row.matName" 
                       :disabled="!scope.row.editable" />
-                  </template>
+
+                    <el-select v-model="scope.row.matName" placeholder="物料名称" :remote-method="remoteMatSearch"
+                      remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading" @click="handleMatName"
+                      class="!w-180px">
+                      <el-option v-for="item in matList" :key="item.id" :label="item.name" :value="item.id" />
+                    </el-select>
+
+                  </template> -->
                 </el-table-column>
-                <el-table-column prop="inventoryType" label="物料类型">
+                <el-table-column prop="matType" label="物料类型">
                   <template #default="scope">
-                    <dict-tag :type="DICT_TYPE.HELI_MATERIAL_TYPE" :value="scope.row.inventoryType" />
+                    <dict-tag :type="DICT_TYPE.HELI_MATERIAL_TYPE" :value="scope.row.matType" />
                   </template>
                 </el-table-column>
-                <el-table-column prop="spec" label="规格/型号" />
+                <el-table-column prop="matSpec" label="规格/型号" />
 
-                <el-table-column prop="inventoryUnitId" label="系统单位">
+                <el-table-column prop="matUnit" label="系统单位">
                   <template #default="scope">
-                    <dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.inventoryUnitId" />
+                    <dict-tag :type="DICT_TYPE.HELI_MATERIAL_UNIT" :value="scope.row.matUnit" />
                   </template>
                 </el-table-column>
-                <el-table-column prop="unit" width="120" label="入库库区">
+                <el-table-column prop="rgid" width="140" label="入库库区" required>
                   <template #default="scope">
-                    <el-select v-model="scope.row.unit" placeholder="" style="width: 100%">
+                    <el-select v-model="scope.row.rgid" placeholder="" style="width: 100%" @change="handleRg(scope)">
-                      <el-option v-for="dict in getIntDictOptions(DICT_TYPE.PRODUCT_INVENTORY_UNIT_ID)" :key="dict.value"
+                      <el-option v-for="dict in rgList" :key="dict.id" :label="dict.rgName" :value="dict.id" />
-                        :label="dict.label" :value="dict.value.toString()" />
                     </el-select>
                   </template>
                 </el-table-column>
-                <el-table-column prop="unit" width="120" label="入库库位">
+                <el-table-column prop="pnid" width="140" label="入库库位" required>
                   <template #default="scope">
-                    <el-select v-model="scope.row.unit" placeholder="" style="width: 100%">
+                    <el-select v-model="scope.row.pnid" placeholder="" style="width: 100%">
-                      <el-option v-for="dict in getIntDictOptions(DICT_TYPE.PRODUCT_INVENTORY_UNIT_ID)" :key="dict.value"
+                      <el-option v-for="dict in pnList" :key="dict.id" :label="dict.pnName" :value="dict.id" />
-                        :label="dict.label" :value="dict.value.toString()" />
                     </el-select>
                   </template>
                 </el-table-column>
-                <el-table-column prop="proportionNum" width="120" label="本次入库数量">
+                <el-table-column prop="storageOkQty" width="120" label="入库数量" required>
                   <template #default="scope">
-                    <el-input v-model="scope.row.proportionNum" :disabled="!scope.row.editable" />
+                    <el-input v-model="scope.row.storageOkQty"  />
                   </template>
                 </el-table-column>
-                <el-table-column prop="proportionNum" width="120" label="批次号">
+                <el-table-column prop="lotNo" width="120" label="批次号">
                   <template #default="scope">
-                    <el-input v-model="scope.row.proportionNum" :disabled="!scope.row.editable" />
+                    <el-input v-model="scope.row.lotNo"  />
                   </template>
                 </el-table-column>
-                <el-table-column prop="proportionNum" width="150" label="备注">
+                <el-table-column prop="description" width="150" label="备注">
                   <template #default="scope">
-                    <el-input v-model="scope.row.proportionNum" :disabled="!scope.row.editable" />
+                    <el-input v-model="scope.row.description"  />
                   </template>
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="240">
@@ -252,8 +261,8 @@
     <div class="text-center hl-footer">
       <el-button @click="goback" size="large">取 消</el-button>
       <el-button @click="submitForm" type="success" :disabled="formLoading" size="large">保 存</el-button>
-      <el-button @click="submitForm" type="primary" :disabled="formLoading" size="large">提 交</el-button>
+      <el-button @click="submitForm" v-if="isShow" type="primary" :disabled="formLoading" size="large">提 交</el-button>
-      <el-button @click="submitForm" type="danger" :disabled="formLoading" size="large">报 废</el-button>
+      <el-button @click="submitForm" v-if="isShow" type="danger" :disabled="formLoading" size="large">报 废</el-button>
     </div>
   </el-card>
 </template>
@@ -264,9 +273,12 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import type { UploadProps, UploadUserFile } from 'element-plus'
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import * as MouldTypeApi from '@/api/heli/mouldtype'
+
+import * as MaterialApi from '@/api/heli/material'
 import * as WarehouseApi from '@/api/heli/warehouse'
 import * as RgApi from '@/api/heli/rg'
 import * as PnApi from '@/api/heli/pn'
+import { ITEM_RENDER_EVT } from 'element-plus/es/components/virtual-list/src/defaults'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -286,8 +298,8 @@ const formData = ref({
   description: undefined,
   status: undefined,
   whId: undefined,
-  creator :undefined,
+  creator: undefined,
-  createTime :undefined,
+  createTime: undefined,
   keeper: undefined,
   keeperTime: undefined,
   outbound: undefined,
@@ -358,22 +370,29 @@ const resetForm = () => {
   formRef.value?.resetFields()
 }
 
+var matCount = 1
 const onAddItem = () => {
   const newData = {
     // 新数据的属性
-    projectName: '',
+    id : matCount,
-    name: '',
+    matId: '',
-    productStatus: '',
+    matName: '',
-    spec: '',
+    matCode: '',
-    inventoryUnitId: '',
+    matType :'',
-    inventoryType: '',
+    matSpec: '',
-    barCode: '',
+    matUnit: '',
-    productTypeId: '',
+    whid: '',
-    unit: [],
+    rgid: '',
-    editable: true,
+    pnid: '',
+    pnlist : ref([]),
+    storageOkQty: '',
+    lotNo: '',
+    description: '',
     productBomItemValueDOList: []
   }
+  matCount = matCount+ 1
   formData.value.productBomItemDOList.push(newData)
+  
 }
 
 // 复制数据
@@ -383,20 +402,26 @@ const handlefuke = (index, item) => {
   // 复制数据
   const newData: any = {
     ...data,
-    projectName: item.projectName,
+    id : matCount,
-    name: item.name,
+    matId: item.matId,
-    productStatus: item.productStatus,
+    matName: item.matName,
-    spec: item.spec,
+    matCode: item.matCode,
-    inventoryUnitId: item.inventoryUnitId,
+    matType : item.matType,
-    inventoryType: item.spec,
+    matSpec: item.matSpec,
-    barCode: item.spec,
+    matUnit: item.matUnit,
-    productTypeId: item.spec,
+    whid: item.whid,
-    unit: [],
+    rgid: item.rgid,
-    editable: true,
+    pnid: item.pnid,
+    pnlist : item.pnlist,
+    storageOkQty: item.storageOkQty,
+    lotNo: item.lotNo,
+    description: item.description,
     productBomItemValueDOList: []
   }
+  matCount = matCount+ 1
   // 添加新数据
   formData.value.productBomItemDOList.splice(index + 1, 0, newData)
+ 
 }
 
 //点击编辑 / 保存   input框是否可输入
@@ -488,62 +513,103 @@ const handleDelete = (index: number) => {
 //仓库全数据
 const warehouseList = ref([])
 //库区全数据
-const rgList = ref([])
+var rgList = ref([])
 //库位全数据
-const pnList = ref([])
+var pnList = ref([])
-/** 初始化 **/
+const handleWh = (async (wid) => {
-onMounted(async () => {
-
-  const router = useRoute();
-  dialogTitle.value = t('action.' + router.query.type)
-
-  isShow.value =router.query.type == "create"?false: true
-
-  //-------------------仓库全数据
-  const queryParamsWarehouse = reactive({
-    pageNo: 1,
-    pageSize: 99,
-    whStatus :1
-  })
-  const data = await WarehouseApi.getWarehousePage(queryParamsWarehouse)
-
-  data.list.forEach(element => {
-    element.label = element.whName
-    element.value = element.id
-  });
-
-  warehouseList.value = data.list
-  //-------------------
   //-------------------库区全数据
   const queryParamsRg = reactive({
     pageNo: 1,
     pageSize: 99,
-    rgStatus : 1
+    whId: wid
   })
   const dataRg = await RgApi.getRgPage(queryParamsRg)
 
-  dataRg.list.forEach(element => {
+  rgList.value = []
-    element.label = element.rgName
+  pnList.value = []
-    element.value = element.id
-  });
-
   rgList.value = dataRg.list
+
+  formData.value.productBomItemDOList.forEach( item =>{
+    item.rgid = ''
+    item.pnid = ''
+    item.pnlist = []
+  })
   //-------------------
+})
+const handleRg = (async (scope) => {
   //-------------------库位全数据
-    const queryParamsRPn = reactive({
+  const queryParamsRPn = reactive({
     pageNo: 1,
     pageSize: 99,
-    pnStatus : 1
+    rgId: scope.row.rgid,
+    pnStatus: 1
   })
   const dataPn = await PnApi.getPnPage(queryParamsRPn)
+  pnList.value = []
+  pnList.value = dataPn.list
+  scope.row.pnlist =  dataPn.list
+  //-------------------
+})
 
-  dataRg.list.forEach(element => {
-    element.label = element.rgName
-    element.value = element.id
-  });
 
-  pnList.value = dataPn.list
+const matList = ref<MaterialApi.MaterialVO[]>([]) // 用户列表
+const matSelectLoading = ref(false);
+const remoteMatSearch = async (query) => {
+  matSelectLoading.value= true
+  // 获得用户列表
+  let matParams = {
+    pageNo: 1,
+    pageSize: 10,
+    name : query,
+    status: "1"
+  }
+  const dataMat = await MaterialApi.getMaterialPage(matParams)
+  matList.value = []
+  matList.value = dataMat.list
+  matSelectLoading.value= false
+
+}
+const remoteMatCodeSearch = async (query) => {
+  matSelectLoading.value= true
+  // 获得用户列表
+  let matParams = {
+    pageNo: 1,
+    pageSize: 10,
+    code : query,
+    status: "1"
+  }
+  const dataMat = await MaterialApi.getMaterialPage(matParams)
+  matList.value = []
+  matList.value = dataMat.list
+  matSelectLoading.value= false
+
+}
+
+const handleMatCode = async (scope) =>{
+
+  if(scope.row.matCode){
+    const matVo = await MaterialApi.getMaterial(scope.row.matCode)
+    scope.row.matId = matVo.id
+    scope.row.matName = matVo.name
+    scope.row.matSpec = matVo.spec
+    scope.row.matType = matVo.materialType
+    scope.row.matUnit = matVo.unit
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+
+  const router = useRoute();
+  dialogTitle.value = t('action.' + router.query.type)
+
+  isShow.value = router.query.type == "create" ? false : true
+
+  //-------------------仓库全数据
+  const data = await WarehouseApi.getWarehouseSimpList()
+  warehouseList.value = data
   //-------------------
+
 })
 </script>
 <style>