提交物料模块修改

廖井涛

2024-04-07 86be28dd91854ff36dbc88d40a79efcb9b7229a6

 north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/SelectIngredientsStock.vue

@@ -59,6 +59,18 @@

})

const values = ref('')
const selectOptions = [
  {
    value: '库存',
    label: '库存'
  },
  {
    value: '工程',
    label: '工程',
  }
]

let selectDate = ref(["",""])
let BasicData = ref([])
let materialStore= ref([])
@@ -72,6 +84,7 @@
  {field: 'materialCode', width: '150',title: '物料编码', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'producer', width: '100',title: '产地', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'id',width: '100', title: '库存编号', sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'projectNo',width: '100', title: '工程号', sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  //{field: 'safetyStock', width: '100',title: '安全库存', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'inventoryQuantity',width: '100', title: '库存数量', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'availableQuantity', width: '100',title: '可用库存', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
@@ -100,6 +113,7 @@
      gridOptions.columns.push(aa)

    }
    values.value='库存'
    getInventoryWorks()

  }else{
@@ -110,6 +124,7 @@


const getInventoryWorks = () => {

  request.post(`/MaterialInventory/getSelectMaterialInventoryDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
@@ -161,6 +176,43 @@
  })
}

const selectInventoryWork = () => {
  if(values.value==='库存'){
    getInventoryWorks()
  }else{
    getInventoryEngineeringWork()
  }
}

const getInventoryEngineeringWork = () => {

    request.post(`/MaterialInventory/getSelectMaterialInventoryEngineeringDate/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

      if(res.code==200){
        console.log(res.data)
        materialStore.value=[]
        for (let i=0;i<res.data.data.length;i++){
          materialStore.value[i]=(res.data.data[i])
          materialStore.value[i].json=(JSON.parse(res.data.data[i].json))

        }

        total.dataTotal = res.data.total.total*1
        total.pageTotal= res.data.total.pageTotal
        pageNum.value=1
        selectDate.value = res.data.selectDate
        produceList = deepClone(materialStore.value)
        xGrid.value.loadData(produceList)
        gridOptions.loading=false
      }else{
        ElMessage.warning(res.msg)
        router.push("/login")
      }
    })


}



const selectOrderList = ()=>{
@@ -176,7 +228,11 @@
        gridOptions.columns.push(aa)

      }
      getInventoryWorkPaging()
      if(values.value==='库存'){
        getInventoryWorkPaging()
      }else{
        getInventoryEngineeringWork()
      }

    }else{
      ElMessage.warning(res.msg)
@@ -204,7 +260,7 @@
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 50},//鼠标移动或选择高亮
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  showFooter: true,//显示脚
  printConfig: {},
@@ -271,18 +327,33 @@
            ElMessage.warning(t('productStock.unselectedData'))
            return
          }
          console.log(selectRecords)
          let id = ""
          const array = [];
          for (let i = 0; i < selectRecords.length; i++) {
            array.push(selectRecords[i].id)
            if (i + 1 === selectRecords.length) {
              id += selectRecords[i].id
            } else {
              id += selectRecords[i].id + "|"
          if (values.value==='库存'){
            for (let i = 0; i < selectRecords.length; i++) {
              array.push(selectRecords[i].id)
              if (i + 1 === selectRecords.length) {
                id += selectRecords[i].id
              } else {
                id += selectRecords[i].id + "|"
              }
            }
          }else{
            for (let i = 0; i < selectRecords.length; i++) {
              array.push(selectRecords[i].useId)
              if (i + 1 === selectRecords.length) {
                id += selectRecords[i].useId
              } else {
                id += selectRecords[i].useId + "|"
              }
            }
          }

          router.push({path: '/main/ingredientsStock/CreateOutbound', query: {id: id}})



          router.push({path: '/main/ingredientsStock/CreateOutbound', query: {id: id,type:values.value}})
          break


@@ -374,7 +445,7 @@
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 50},//鼠标移动或选择高亮
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  showFooter: true,//显示脚
  printConfig: {},
@@ -560,7 +631,18 @@

    />
    <el-button @click="changeDate" style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">查询</el-button>

    <div>
      <el-row>
        <el-select v-model="values" placeholder="请选择类别" @change="selectInventoryWork">
          <el-option
              v-for="item in selectOptions"
              :key="item.value"
              :label="item.label"
              :value="item.value"
          />
        </el-select>
      </el-row>
    </div>

    <vxe-grid
        max-height="100%"