修改语言权限切换以及接口命名替换

廖井涛

2024-09-27 c26d3f181ddd40a23aaef5bbbd5f0fcf1683d68a

修改语言权限切换以及接口命名替换

 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue

@@ -30,7 +30,7 @@
  form.value.deliveryId=props.deliveryId


  request.post(`/Delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
  request.post(`/delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
    if(res.code==200){
      produceList.value = deepClone(res.data.data)
      delivery.value=deepClone(res.data.delivery)

 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet2.vue

@@ -28,7 +28,7 @@
  form.value.deliveryId=props.deliveryId


  request.post(`/Delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
  request.post(`/delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
    if(res.code==200){
      produceList.value = deepClone(res.data.data)
      delivery.value=deepClone(res.data.delivery)

 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet3.vue

@@ -33,7 +33,7 @@
  }
  form.value.orderId=props.orderId

  request.post(`/Delivery/getSelectOrderPrinting/null`,form.value).then((res) => {
  request.post(`/delivery/getSelectOrderPrinting/null`,form.value).then((res) => {
    if(res.code==200){
      productIdData.value=deepClone(res.data.data)
      produceList.value = deepClone(res.data.data)
@@ -112,7 +112,7 @@
    selectedValues.value=null;
  }

  request.post(`/Delivery/getSelectOrderPrinting/${selectedValues.value}`,form.value).then((res) => {
  request.post(`/delivery/getSelectOrderPrinting/${selectedValues.value}`,form.value).then((res) => {
    if(res.code==200){
      sumMoney=0
      produceList.value = deepClone(res.data.data)

 north-glass-erp/northglass-erp/src/lang/en.js

@@ -556,6 +556,16 @@
    },

    productStock:{
        page:{
            productStockList:"Stock Inquiry",
            createProductStock:"Finished product Into Stock",
            storageRecord:"出入库记录",
            orderAllocation:'Order Allocation',
            finishedProductOut:'Finished Product Out Of Stock',
            finishedGoodsIssue:'Finished Goods Delivery',
            transferRecord:'Mutual Exchange Records',
            takeOutRecord:'Take Out Records'
        },
        inventoryQuery:'Stock Inquiry',
        finishedProductWarehousing:"Finished product Into Stock ",
        finishedProductOutbound:'Finished Product Out Of Stock',
@@ -962,7 +972,11 @@
        teamName:'Squad name',
        processInvolved:'Working procedure',
    },
    mainIngredient:{
    ingredients:{
        page:{
            selectIngredients:"Material data",
            createIngredients:"Material addition"
        },
        materialInformation :'Material data',
        materialAddition :'Material addition',
        originalFilm :'Original glass',
@@ -973,7 +987,15 @@
        pleaseEnterData :'Please enter data',
        pleaseEnter :'Please enter',
    },
    mainIngredientStock:{
    ingredientsStock:{
        page:{
            selectIngredientsStock:"Material inventory",
            materialOutbound:"Material delivery",
            returnToStorage:"Return to the warehouse",
            selectSurplusMaterials:"余料管理",
            createOutbound:'物料出库新增',
            returnToStorageCreate:'Returned warehouse addition'
        },
        materialName :'Material name',
        producer :'Place of origin',
        dateOfManufacture :'Production date',
@@ -1013,14 +1035,26 @@
        returnQuantity :'Quantity returned to storage',
        materialReturnType :'Material return type',
        createTime :'Returned warehouse date',

        surplusMaterialManagement :'余料管理',
        additionOfSurplusMaterials :'余料新增',
        excessMaterialOutflow :'余料出库',
    },
    mainBasicData:{
    warehouseBasicData:{
        page:{
            warehouseSearchBasicData:"Warehouse Basic Data"
        },
        BasicData :'Basic data',
        operateTypeName :'Name',
        operateType :'Another name',
        type :'Type',
        takeOut :'Take out',
    },
    stockReport:{
        page:{
            warehouseReport:"Warehouse Basic Data"
        }
    },
    components:{
        addNewSignature :'Add label name',
        addColumnNames :'New column name',

 north-glass-erp/northglass-erp/src/lang/ru.js

@@ -554,6 +554,16 @@
    },

    productStock:{
        page:{
            productStockList:"Инвентаризация",
            createProductStock:"Хранение готовой продукции",
            storageRecord:"出入库记录",
            orderAllocation:'Перераспределение заказов',
            finishedProductOut:'Выпуск готовой продукции',
            finishedGoodsIssue:'Получение готовой продукции',
            transferRecord:'Регистрация переводов',
            takeOutRecord:'Полученные записи'
        },
        inventoryQuery:'Инвентаризация',
        finishedProductWarehousing:'Хранение готовой продукции',
        finishedProductOutbound:'Выпуск готовой продукции',
@@ -955,7 +965,11 @@
        teamName:'Название группы',
        processInvolved:'Осуществляемая операция',
    },
    mainIngredient:{
    ingredients:{
        page:{
            selectIngredients:"Материальные данные",
            createIngredients:"Увеличение материалов"
        },
        materialInformation :'Материальные данные',
        materialAddition :'Увеличение материалов',
        originalFilm :'Прототип',
@@ -966,7 +980,15 @@
        pleaseEnterData :'Введите данные.',
        pleaseEnter :'Введите',
    },
    mainIngredientStock:{
    ingredientsStock:{
        page:{
            selectIngredientsStock:"Материальные запасы",
            materialOutbound:"Выход материалов из хранилища",
            returnToStorage:"Возвращение в хранилище",
            selectSurplusMaterials:"余料管理",
            createOutbound:'物料出库新增',
            returnToStorageCreate:'Увеличение возврата'
        },
        materialName :'Название материала',
        producer :'Место происхождения',
        dateOfManufacture :'Дата производства',
@@ -1006,14 +1028,26 @@
        returnQuantity :'Количество возвращенных',
        materialReturnType :'Тип возврата материала в хранилище',
        createTime :'Дата возврата',

        surplusMaterialManagement :'余料管理',
        additionOfSurplusMaterials :'余料新增',
        excessMaterialOutflow :'余料出库',
    },
    mainBasicData:{
    warehouseBasicData:{
        page:{
            warehouseSearchBasicData:"Основа производства"
        },
        BasicData :'Базовые данные',
        operateTypeName :'Имя',
        operateType :'Другие названия',
        type :'Тип',
        takeOut :'Вывести',
    },
    stockReport:{
        page:{
            warehouseReport:"База запасов"
        }
    },
    components:{
        addNewSignature :'Добавить имя метки',
        addColumnNames :'Добавление в перечень',

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -560,6 +560,16 @@
        pleaseNumber9:'正确的完工或次破数量',
    },
    productStock:{
        page:{
            productStockList:"库存查询",
            createProductStock:"成品入库",
            storageRecord:"出入库记录",
            orderAllocation:'订单调拨',
            finishedProductOut:'成品出库',
            finishedGoodsIssue:'成品领出',
            transferRecord:'调拨记录',
            takeOutRecord:'领出记录'
        },
        inventoryQuery:'库存查询',
        finishedProductWarehousing:"成品入库 ",
        finishedProductOutbound:'成品出库',
@@ -963,7 +973,11 @@
        teamName:'班组名称',
        processInvolved:'所在工序',
    },
    mainIngredient:{
    ingredients:{
        page:{
            selectIngredients:"物料资料",
            createIngredients:"物料新增"
        },
        materialInformation :'物料资料',
        materialAddition :'物料新增',
        originalFilm :'原片',
@@ -974,7 +988,15 @@
        pleaseEnterData :'请输入数据',
        pleaseEnter :'请输入',
    },
    mainIngredientStock:{
    ingredientsStock:{
        page:{
            selectIngredientsStock:"物料库存",
            materialOutbound:"物料出库",
            returnToStorage:"返库",
            selectSurplusMaterials:"余料管理",
            createOutbound:'物料出库新增',
            returnToStorageCreate:'返库新增'
        },
        materialName :'物料名称',
        producer :'产地',
        dateOfManufacture :'生产日期',
@@ -1019,13 +1041,21 @@
        additionOfSurplusMaterials :'余料新增',
        excessMaterialOutflow :'余料出库',
    },
    mainBasicData:{
    warehouseBasicData:{
        page:{
            warehouseSearchBasicData:"库存基础"
        },
        BasicData :'基础数据',
        operateTypeName :'名称',
        operateType :'别称',
        type :'类型',
        takeOut :'领出',
    },
    stockReport:{
        page:{
            warehouseReport:"仓储报表"
        }
    },
    components:{
        addNewSignature :'新增标签名',
        addColumnNames :'新增列名',

 north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseBasicData.vue

@@ -20,7 +20,7 @@
  <div id="main-div">
    <div id="div-title">
      <el-breadcrumb :separator-icon="ArrowRight">
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/warehouseBasicData/warehouseSearchBasicData' }">{{$t('mainBasicData.BasicData')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/warehouseBasicData/warehouseSearchBasicData' }">{{$t('warehouseBasicData.BasicData')}}</el-breadcrumb-item>
        <el-breadcrumb-item v-show="false" />
      </el-breadcrumb>
    </div>

 north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseCreateBasicData.vue

@@ -15,22 +15,22 @@
  input:''
})
let options=ref([
  { label: t('mainIngredientStock.inventoryOrganization'),
  { label: t('ingredientsStock.inventoryOrganization'),
    value: "inventoryOrganization",
  },
  { label: t('mainBasicData.takeOut'),
  { label: t('warehouseBasicData.takeOut'),
    value: "takeOut",
  },
  { label: t('mainIngredientStock.materialOutboundType'),
  { label: t('ingredientsStock.materialOutboundType'),
    value: "outboundType",
  },
  { label: t('mainIngredientStock.materialReturnType'),
  { label: t('ingredientsStock.materialReturnType'),
    value: "returningType",
  },
  /*{ label: t('mainIngredient.originalFilm'),
  /*{ label: t('ingredients.originalFilm'),
    value: "originalFilm",
  },
  { label: t('mainIngredient.accessories'),
  { label: t('ingredients.accessories'),
    value: "accessories",
  },*/
])
@@ -52,22 +52,22 @@
const emit =  defineEmits(['gaveParent'])
const saveBasicData =  () =>{
  if (basic.value.operateType[0]==='inventoryOrganization'){
    basic.value.type=t('mainIngredientStock.inventoryOrganization')
    basic.value.type=t('ingredientsStock.inventoryOrganization')
  }
  else if(basic.value.operateType[0]==='takeOut'){
    basic.value.type=t('mainBasicData.takeOut')
    basic.value.type=t('warehouseBasicData.takeOut')
  }
  else if(basic.value.operateType[0]==='outboundType'){
    basic.value.type=t('mainIngredientStock.materialOutboundType')
    basic.value.type=t('ingredientsStock.materialOutboundType')
  }
  else if(basic.value.operateType[0]==='returningType'){
    basic.value.type=t('mainIngredientStock.materialReturnType')
    basic.value.type=t('ingredientsStock.materialReturnType')
  }
  /*else if(basic.value.operateType[0]==='originalFilm'){
    basic.value.type=t('mainIngredient.originalFilm')
    basic.value.type=t('ingredients.originalFilm')
  }
  else if(basic.value.operateType[0]==='accessories'){
    basic.value.type=t('mainIngredient.accessories')
    basic.value.type=t('ingredients.accessories')
  }*/
  if(basic.value.operateType[0]==='' || basic.value.input===''){
    return
@@ -88,7 +88,7 @@
  submitArr.type = basic.value.type
  submitArr.operateTypeName = basic.value.input
  if(basic.value.input===''){
    ElMessage.warning(t('mainIngredient.pleaseEnterData'))
    ElMessage.warning(t('ingredients.pleaseEnterData'))
  }else{
    request.post(`/BasicWarehouse/updateBasicWarehouse`, submitArr).then(res => {
      if (res.data) {

 north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseSearchBasicData.vue

@@ -46,9 +46,9 @@
  columns:[
    {title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
    {type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left",},
    {field:'operateTypeName',title: t('mainBasicData.operateTypeName')},
    {field:'operateType',title: t('mainBasicData.operateType')},
    {field:'type',title: t('mainBasicData.type')},
    {field:'operateTypeName',title: t('warehouseBasicData.operateTypeName')},
    {field:'operateType',title: t('warehouseBasicData.operateType')},
    {field:'type',title: t('warehouseBasicData.type')},
    {field:'createTime',title: t('basicData.creationTime')},



 north-glass-erp/northglass-erp/src/views/mm/ingredient/CreateIngredients.vue

@@ -17,12 +17,12 @@
const value = ref('')
const options = [
  {
    value: t('mainIngredient.originalFilm'),
    label: t('mainIngredient.originalFilm')
    value: t('ingredients.originalFilm'),
    label: t('ingredients.originalFilm')
  },
  {
    value: t('mainIngredient.accessories'),
    label: t('mainIngredient.accessories'),
    value: t('ingredients.accessories'),
    label: t('ingredients.accessories'),
  }
]

@@ -86,7 +86,7 @@
    filterData[item.OperateType]=item.Type
    const customerName = item.Type
    if(customerName === null || customerName === undefined || customerName === ''){
      ElMessage.error(t('mainIngredient.pleaseEnter')+item.OperateTypeName)
      ElMessage.error(t('ingredients.pleaseEnter')+item.OperateTypeName)
      isBool=false
      return
    }
@@ -101,7 +101,7 @@

  let materialStore

  if(value.value===t('mainIngredient.originalFilm')){
  if(value.value===t('ingredients.originalFilm')){
     materialStore={
      id:ruleForm.value.id,
      type:value.value,
@@ -109,7 +109,7 @@
      width:BasicData.value[0].Type,
      height:BasicData.value[1].Type
    }
  }else if(value.value===t('mainIngredient.accessories')){
  }else if(value.value===t('ingredients.accessories')){
     materialStore={
      id:ruleForm.value.id,
      type:value.value,
@@ -119,7 +119,7 @@


  if(isBool){
    request.post("/MaterialStore/saveMaterialStore", materialStore).then((res) => {
    request.post("/materialStore/saveMaterialStore", materialStore).then((res) => {
      if(res.code==200 && res.data==="true"){
        resetForm()
        ElMessage.success(t('basicData.msg.saveSuccess'))
@@ -144,7 +144,7 @@
  if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
    ruleForm.value.id = Number(str)

    request.post(`/MaterialStore/getSelectMaterialStore/1/100`,ruleForm.value).then((res) => {
    request.post(`/materialStore/getSelectMaterialStore/1/100`,ruleForm.value).then((res) => {
      if(res.code==200){
        ruleForm.value=deepClone(res.data.data[0])
        value.value=ruleForm.value.type
@@ -171,7 +171,7 @@
<div>
  <el-row>
  <el-col :span="4">
    <el-select v-model="value" :placeholder="$t('mainIngredient.pleaseSelectACategory')" @change="getWork">
    <el-select v-model="value" :placeholder="$t('ingredients.pleaseSelectACategory')" @change="getWork">
      <el-option
          v-for="item in options"
          :key="item.value"
@@ -189,7 +189,7 @@
             v-for="item in BasicData" >
       <el-col :span="4.5" >
         {{item.OperateTypeName}}：
         <el-select filterable v-if="item.OperateTypeName==$t('mainIngredient.films')" v-model="item.Type"  :placeholder="$t('mainIngredient.pleaseEnterData')" style="width: 150px; height: 30px;" >
         <el-select filterable v-if="item.OperateTypeName==$t('ingredients.films')" v-model="item.Type"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" >
           <el-option
               v-for="item in titleSelectJson"
               :key="item.id"
@@ -197,7 +197,7 @@
               :value="item.basicName"
           />
         </el-select>
         <el-input v-else v-model="item.Type"  :placeholder="$t('mainIngredient.pleaseEnterData')" style="width: 150px; height: 30px;" />
         <el-input v-else v-model="item.Type"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />

       </el-col>


 north-glass-erp/northglass-erp/src/views/mm/ingredient/Ingredients.vue

@@ -26,8 +26,8 @@
  <div id="main">
    <div id="div-title">
      <el-breadcrumb :separator-icon="ArrowRight">
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/ingredients/selectIngredients' }">{{$t('mainIngredient.materialInformation')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/ingredients/createIngredients' }">{{$t('mainIngredient.materialAddition')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/ingredients/selectIngredients' }">{{$t('ingredients.materialInformation')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/ingredients/createIngredients' }">{{$t('ingredients.materialAddition')}}</el-breadcrumb-item>
        <el-breadcrumb-item v-show="false" />
      </el-breadcrumb>


 north-glass-erp/northglass-erp/src/views/mm/ingredient/SelectIngredients.vue

@@ -25,7 +25,7 @@
      let flowData = ref({
        id: row.id
      })
      request.post("/MaterialStore/deleteMaterialStore",flowData.value).then((res) => {
      request.post("/materialStore/deleteMaterialStore",flowData.value).then((res) => {
        if(res.code==200 && res.data==="true"){
          ElMessage.success(t('basicData.msg.deleteSuccess'))
          router.push({path:'/main/ingredients/SelectIngredients',query:{random:Math.random()}})
@@ -46,12 +46,12 @@
const value = ref('')
const options = [
  {
    value: t('mainIngredient.originalFilm'),
    label: t('mainIngredient.originalFilm')
    value: t('ingredients.originalFilm'),
    label: t('ingredients.originalFilm')
  },
  {
    value: t('mainIngredient.accessories'),
    label: t('mainIngredient.accessories'),
    value: t('ingredients.accessories'),
    label: t('ingredients.accessories'),
  }
]

@@ -90,12 +90,12 @@
  {type:'expand',fixed:'left',slots: { content:'content' },width: '60'},
  {title: t('basicData.operate'), width: '110', slots: { default: 'button_slot' },fixed:'left'},
  { type: 'seq',fixed:'left', title: t('basicData.Number'), width: '80' },
  {field: 'id', width: '150',title: t('mainIngredient.materialCode'), sortable: true,showOverflow:'ellipsis' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
  {field: 'id', width: '150',title: t('ingredients.materialCode'), sortable: true,showOverflow:'ellipsis' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
]

//第一次加载默认
value.value=t('mainIngredient.originalFilm')
filterData.value.type=t('mainIngredient.originalFilm')
value.value=t('ingredients.originalFilm')
filterData.value.type=t('ingredients.originalFilm')
request.get(`/BasicWarehouse/BasicWarehouseType/${value.value}`).then((res) => {
  if(res.code==200){
    gridOptions.columns.splice(0,gridOptions.columns.length)
@@ -148,7 +148,7 @@

//数据绑定
const getWorks = () => {
  request.post(`/MaterialStore/getSelectMaterialStore/1/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/materialStore/getSelectMaterialStore/1/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      materialStore.value=[]
@@ -173,7 +173,7 @@

//分页查询
const getWorkPaging = () => {
  request.post(`/MaterialStore/getSelectMaterialStore/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/materialStore/getSelectMaterialStore/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      materialStore.value=[]
@@ -298,7 +298,7 @@
    <div class="head">
      <el-row>
        <el-col :span="4">
          <el-select v-model="value" :placeholder="$t('mainIngredient.pleaseSelectACategory')" @change="getWork">
          <el-select v-model="value" :placeholder="$t('ingredients.pleaseSelectACategory')" @change="getWork">
            <el-option
                v-for="item in options"
                :key="item.value"

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/CreateOutBound.vue

@@ -88,22 +88,22 @@
  //{type:'expand',fixed:"left",slots: { content:'content' },width: '60'},
  {field: 'select',type: 'checkbox',fixed:"left", title: t('basicData.check'), width: '80' },
  { type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
  {field: 'inventoryOrganization', width:'150', title: t('mainIngredientStock.inventoryOrganization'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged },
  {field: 'materialCode', width: '150',title: t('mainIngredient.materialCode'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'producer', width: '100',title: t('mainIngredientStock.producer'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'projectNo', width: '100',title: t('mainIngredientStock.projectNo'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'inventoryOrganization', width:'150', title: t('ingredientsStock.inventoryOrganization'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged },
  {field: 'materialCode', width: '150',title: t('ingredients.materialCode'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'producer', width: '100',title: t('ingredientsStock.producer'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'projectNo', width: '100',title: t('ingredientsStock.projectNo'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'inventoryQuantity',width: '100', title: t('productStock.inventoryQuantity'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'availableQuantity', width: '100',title: t('productStock.availableQuantity'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'outboundQuantity', width:'150', title: t('mainIngredientStock.outboundQuantity'), sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } }},
  {field: 'outboundQuantity', width:'150', title: t('ingredientsStock.outboundQuantity'), sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } }},
  {field: 'singlePieceArea', width: '100',title: t('productStock.singlePieceArea'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'dateOfManufacture',width: '100', title: t('mainIngredientStock.dateOfManufacture'), sortable: true},
  {field: 'dateOfManufacture',width: '100', title: t('ingredientsStock.dateOfManufacture'), sortable: true},
  {field: 'inventoryArea',width: '100', title: t('productStock.inventoryArea'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'remarks',width: '80', title: t('basicData.remarks'), sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } }},
]


//页面第一次加载
request.get(`/BasicWarehouse/BasicWarehouseTypes/`+t('mainIngredientStock.materialOutboundType')).then((res) => {
request.get(`/BasicWarehouse/BasicWarehouseTypes/`+t('ingredientsStock.materialOutboundType')).then((res) => {

  if(res.code==200){

@@ -121,7 +121,7 @@

//列查询
const getWork = () => {
  request.get(`/BasicWarehouse/BasicWarehouseType/`+t('mainIngredient.originalFilm')+'|'+t('mainIngredient.accessories')).then((res) => {
  request.get(`/BasicWarehouse/BasicWarehouseType/`+t('ingredients.originalFilm')+'|'+t('ingredients.accessories')).then((res) => {
    if(res.code==200){
      gridOptions.columns=[]
      BasicData.value = res.data
@@ -157,10 +157,10 @@
  const type = route.query.type
  if (typeof id !== 'undefined' && id !== null && id !== '' && id !== '\n' && id !== '\r'){

    if(type===t('mainIngredientStock.inventory')){
    if(type===t('ingredientsStock.inventory')){
      filterData.value.stockId=id
      number.value=id
      request.post("/MaterialInventory/getSelectMaterialInventory/1/100",filterData.value).then((res) => {
      request.post("/materialInventory/getSelectMaterialInventory/1/100",filterData.value).then((res) => {

        if(res.code==200){

@@ -190,7 +190,7 @@
    }else{
      optimizeUse.value.rawStockCode=id
      number.value=id
      request.post("/MaterialInventory/getSelectMaterialInventoryEngineering/1/100",optimizeUse.value).then((res) => {
      request.post("/materialInventory/getSelectMaterialInventoryEngineering/1/100",optimizeUse.value).then((res) => {

        if(res.code==200){

@@ -228,7 +228,7 @@

      filterData.value.materialOutboundId=str
      //第一次调用
      request.post("/MaterialInventory/getSelectMaterialOutbound/1/100",filterData.value).then((res) => {
      request.post("/materialInventory/getSelectMaterialOutbound/1/100",filterData.value).then((res) => {

        if(res.code==200){
          titleUploadData.value=deepClone(res.data.materialOutbound)
@@ -288,22 +288,22 @@
          //表头数据校验
          const outboundType = titleUploadData.value.outboundType
          if(outboundType === null || outboundType === undefined || outboundType === ''){
            ElMessage.error(t('mainIngredientStock.pleaseOutboundType'))
            ElMessage.error(t('ingredientsStock.pleaseOutboundType'))
            return
          }
          const materialRequisitionPersonnel = titleUploadData.value.materialRequisitionPersonnel
          if(materialRequisitionPersonnel === null || materialRequisitionPersonnel === undefined || materialRequisitionPersonnel === ''){
            ElMessage.error(t('mainIngredientStock.pleaseMaterialRequisitionPersonnel'))
            ElMessage.error(t('ingredientsStock.pleaseMaterialRequisitionPersonnel'))
            return
          }
          /*const materialRequisitionTeam = titleUploadData.value.materialRequisitionTeam
          if(materialRequisitionTeam === null || materialRequisitionTeam === undefined || materialRequisitionTeam === ''){
            ElMessage.error(t('mainIngredientStock.pleaseMaterialRequisitionTeam'))
            ElMessage.error(t('ingredientsStock.pleaseMaterialRequisitionTeam'))
            return
          }*/
          /*const orderId = titleUploadData.value.orderId
          if(orderId === null || orderId === undefined || orderId === ''){
            ElMessage.error(t('mainIngredientStock.pleaseOrderId'))
            ElMessage.error(t('ingredientsStock.pleaseOrderId'))
            return
          }*/

@@ -316,7 +316,7 @@
            materialOutboundId: route.query.materialOutboundId

          })
          request.post("/MaterialInventory/saveMaterialOutbound", flowData.value).then((res) => {
          request.post("/materialInventory/saveMaterialOutbound", flowData.value).then((res) => {
            if(res.code==200 && res.data==="true"){
              ElMessage.success(t('basicData.msg.saveSuccess'))
              router.push({path: '/main/ingredientsStock/MaterialOutbound', query:{random:Math.random()}})
@@ -338,7 +338,7 @@
            type: 1

          })
          request.post("/MaterialInventory/updateMaterialOutboundToExamine", flowData.value).then((res) => {
          request.post("/materialInventory/updateMaterialOutboundToExamine", flowData.value).then((res) => {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.ReviewSuccess'))
              router.push({path: '/main/ingredientsStock/MaterialOutbound', query:{random:Math.random()}})
@@ -357,7 +357,7 @@
            type: 0

          })
          request.post("/MaterialInventory/updateMaterialOutboundToExamine", flowData.value).then((res) => {
          request.post("/materialInventory/updateMaterialOutboundToExamine", flowData.value).then((res) => {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
              router.push({path: '/main/ingredientsStock/MaterialOutbound', query:{random:Math.random()}})
@@ -483,9 +483,9 @@
  outboundQuantity: [{
    validator (e) {
      if (e.row.outboundQuantity > e.row.availableQuantity) {
        return new Error(t('mainIngredientStock.theOutboundQuantityCannotBeGreaterThanTheAvailableQuantity'))
        return new Error(t('ingredientsStock.theOutboundQuantityCannotBeGreaterThanTheAvailableQuantity'))
      }else if (e.row.outboundQuantity ==="") {
        return new Error(t('mainIngredientStock.theOutboundQuantityCannotBeEmptyOrEqualTo0'))
        return new Error(t('ingredientsStock.theOutboundQuantityCannotBeEmptyOrEqualTo0'))
      }
      const regex = /^[1-9]\d*$/g
      if ( !regex.test(e.row.outboundQuantity) ) {
@@ -506,16 +506,16 @@
  <div class="main-div">
  <div class="order-primary" style="background-color: white">
    <el-row>
      <el-col  :span="2"><el-text>{{$t('mainIngredientStock.materialRequisitionDate')}}:</el-text></el-col>
      <el-col  :span="2"><el-text>{{$t('ingredientsStock.materialRequisitionDate')}}:</el-text></el-col>
      <el-col  :span="3"><el-input  v-model="titleUploadData.materialRequisitionDate" :readonly="true" ></el-input></el-col>
      <el-col  :span="2"><el-text>{{$t('mainIngredientStock.materialRequisitionPersonnel')}}:</el-text></el-col>
      <el-col  :span="2"><el-text>{{$t('ingredientsStock.materialRequisitionPersonnel')}}:</el-text></el-col>
      <el-col  :span="3"><el-input v-model="titleUploadData.materialRequisitionPersonnel" /></el-col>
      <el-col  :span="2"><el-text>{{$t('mainIngredientStock.materialRequisitionTeam')}}:</el-text></el-col>
      <el-col  :span="2"><el-text>{{$t('ingredientsStock.materialRequisitionTeam')}}:</el-text></el-col>
      <el-col  :span="3"><el-input v-model="titleUploadData.materialRequisitionTeam" /></el-col>

    </el-row>
    <el-row>
      <el-col  :span="2"><el-text>{{$t('mainIngredientStock.outboundType')}}：</el-text></el-col>
      <el-col  :span="2"><el-text>{{$t('ingredientsStock.outboundType')}}：</el-text></el-col>
      <el-col  :span="3">
        <el-select v-model="titleUploadData.outboundType"  clearable placeholder=""  >
          <el-option
@@ -528,7 +528,7 @@
      </el-col>
      <el-col  :span="2"><el-text>{{$t('order.orderId')}}:</el-text></el-col>
      <el-col  :span="3"><el-input v-model="titleUploadData.orderId" /></el-col>
      <el-col  :span="2"><el-text>{{$t('mainIngredientStock.warehouseManager')}}:</el-text></el-col>
      <el-col  :span="2"><el-text>{{$t('ingredientsStock.warehouseManager')}}:</el-text></el-col>
      <el-col  :span="3"><el-input v-model="titleUploadData.warehouseManager" :readonly="true" /></el-col>

    </el-row>

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/IngredientsStock.vue

@@ -26,13 +26,13 @@
  <div id="main">
    <div id="div-title">
      <el-breadcrumb :separator-icon="ArrowRight">
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/ingredientsStock/selectIngredientsStock' }">{{$t('mainIngredientStock.selectIngredientsStock')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/ingredientsStock/materialOutbound' }">{{$t('mainIngredientStock.materialOutbound')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/ingredientsStock/selectIngredientsStock' }">{{$t('ingredientsStock.selectIngredientsStock')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/ingredientsStock/materialOutbound' }">{{$t('ingredientsStock.materialOutbound')}}</el-breadcrumb-item>
<!--        <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/ingredientsStock/OriginalMonthlySettlement' }">原片月结</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/ingredientsStock/AccessoriesMonthlySettlement' }">辅料月结</el-breadcrumb-item>-->
        <el-breadcrumb-item @click="changeRouter(5)" :class="indexFlag===5?'indexTag':''" :to="{ path: '/main/ingredientsStock/returnToStorage' }">{{$t('mainIngredientStock.returnToStorage')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(6)" :class="indexFlag===6?'indexTag':''" :to="{ path: '/main/ingredientsStock/selectSurplusMaterials' }">{{$t('mainIngredientStock.surplusMaterialManagement')}}</el-breadcrumb-item>
        <el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('mainIngredientStock.returnToStorage')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(5)" :class="indexFlag===5?'indexTag':''" :to="{ path: '/main/ingredientsStock/returnToStorage' }">{{$t('ingredientsStock.returnToStorage')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(6)" :class="indexFlag===6?'indexTag':''" :to="{ path: '/main/ingredientsStock/selectSurplusMaterials' }">{{$t('ingredientsStock.surplusMaterialManagement')}}</el-breadcrumb-item>
        <el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('ingredientsStock.returnToStorage')}}</el-breadcrumb-item>
      </el-breadcrumb>

    </div>

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/MaterialOutbound.vue

@@ -37,7 +37,7 @@
      let flowData = ref({
        materialOutboundId:row.materialOutboundId
      })
      request.post("/MaterialInventory/deleteMaterialOutbound",flowData.value).then((res) => {
      request.post("/materialInventory/deleteMaterialOutbound",flowData.value).then((res) => {
        if(res.code==200 && res.data===true){
          ElMessage.success(t('searchOrder.msgDeleteSuccess'))
          router.push({path:'/main/ingredientsStock/MaterialOutbound', query:{random:Math.random()}})
@@ -85,7 +85,7 @@
let selectDate = ref(["",""])


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

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -122,7 +122,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/MaterialInventory/getSelectMaterialOutboundDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/materialInventory/getSelectMaterialOutboundDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -142,7 +142,7 @@


const selectOrderList = ()=>{
  request.post(`/MaterialInventory/getSelectMaterialOutboundDate/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/materialInventory/getSelectMaterialOutboundDate/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
    if(res.code==200){
      selectDate.value = res.data.selectDate

@@ -217,15 +217,15 @@
    {title:  t('basicData.operate'), width: '110', slots: { default: 'button_slot' },fixed:"left"},
    { type: 'seq',fixed:"left", title:  t('basicData.Number'), width: '80' },
    {field: 'reviewedState',title: t('basicData.review'), width: 50, slots: { default: 'state' },},
    {field: 'materialOutboundId', width:'150', title: t('mainIngredientStock.materialOutboundId'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'materialRequisitionPersonnel', width: '150',title: t('mainIngredientStock.materialRequisitionPersonnel'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'materialRequisitionTeam', width: '120',title: t('mainIngredientStock.materialRequisitionTeam'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'materialOutboundId', width:'150', title: t('ingredientsStock.materialOutboundId'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'materialRequisitionPersonnel', width: '150',title: t('ingredientsStock.materialRequisitionPersonnel'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'materialRequisitionTeam', width: '120',title: t('ingredientsStock.materialRequisitionTeam'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderId', width:'150', title: t('order.orderId'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'outboundType', width: '100',title: t('mainIngredientStock.outboundType'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'warehouseManager',width: '100', title: t('mainIngredientStock.warehouseManager'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'materialRequisitionDate', width: '80',title: t('mainIngredientStock.materialRequisitionDate'), sortable: true},
    {field: 'reviewed',width: '100', title: t('mainIngredientStock.reviewed'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'reviewedTime', width: '100',title: t('mainIngredientStock.reviewedTime'), sortable: true},
    {field: 'outboundType', width: '100',title: t('ingredientsStock.outboundType'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'warehouseManager',width: '100', title: t('ingredientsStock.warehouseManager'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'materialRequisitionDate', width: '80',title: t('ingredientsStock.materialRequisitionDate'), sortable: true},
    {field: 'reviewed',width: '100', title: t('ingredientsStock.reviewed'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'reviewedTime', width: '100',title: t('ingredientsStock.reviewedTime'), sortable: true},
    {field: 'createTime',width: '100', title: t('basicData.creationTime'), sortable: true},
  ],//表头按钮
  toolbarConfig: {

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorage.vue

@@ -58,7 +58,7 @@
let selectDate = ref(["",""])


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

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -96,7 +96,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/MaterialInventory/getSelectReturningWarehouseDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/materialInventory/getSelectReturningWarehouseDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -116,7 +116,7 @@


const selectOrderList = ()=>{
  request.post(`/MaterialInventory/getSelectReturningWarehouseDate/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/materialInventory/getSelectReturningWarehouseDate/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
    if(res.code==200){
      selectDate.value = res.data.selectDate

@@ -204,21 +204,21 @@
    {title: t('basicData.operate'), width: '110', slots: { default: 'button_slot' },fixed:"left"},
    { type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
    {field: 'reviewedState',title: t('basicData.review'), width: 50, slots: { default: 'state' },},
    {field: 'returningId', width:'150', title: t('mainIngredientStock.returningId'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'materialRequisitionPersonnel', width: '150',title:  t('mainIngredientStock.materialRequisitionPersonnel'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'materialRequisitionTeam', width: '120',title:  t('mainIngredientStock.materialRequisitionTeam'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'returningId', width:'150', title: t('ingredientsStock.returningId'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'materialRequisitionPersonnel', width: '150',title:  t('ingredientsStock.materialRequisitionPersonnel'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'materialRequisitionTeam', width: '120',title:  t('ingredientsStock.materialRequisitionTeam'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderId', width:'150', title: t('order.orderId'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'project', width:'150', title: t('order.project'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'batch', width:'150', title: t('order.batch'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'returningType', width: '100',title: t('mainIngredientStock.returningType'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'warehouseManager',width: '100', title: t('mainIngredientStock.warehouseManager'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'reviewed',width: '100', title:t('mainIngredientStock.reviewed'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'reviewedTime', width: '100',title: t('mainIngredientStock.reviewedTime'), sortable: true},
    {field: 'returningType', width: '100',title: t('ingredientsStock.returningType'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'warehouseManager',width: '100', title: t('ingredientsStock.warehouseManager'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'reviewed',width: '100', title:t('ingredientsStock.reviewed'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'reviewedTime', width: '100',title: t('ingredientsStock.reviewedTime'), sortable: true},
    {field: 'createTime',width: '100', title: t('basicData.creationTime'), sortable: true},
  ],//表头按钮
  toolbarConfig: {
    buttons: [
      {'code': 'add', 'name': t('mainIngredientStock.returningAdd'),status: 'primary'},
      {'code': 'add', 'name': t('ingredientsStock.returningAdd'),status: 'primary'},
    ],
    /*import: false,
    export: true,

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/ReturnToStorageCreate.vue

@@ -70,35 +70,35 @@
const value = ref('')
const options = [
  {
    value: t('mainIngredient.originalFilm'),
    label: t('mainIngredient.originalFilm')
    value: t('ingredients.originalFilm'),
    label: t('ingredients.originalFilm')
  },
  {
    value: t('mainIngredient.accessories'),
    label: t('mainIngredient.accessories'),
    value: t('ingredients.accessories'),
    label: t('ingredients.accessories'),
  }
]

let arr = [
  {field: 'select',type: 'checkbox',fixed:"left", title: t('basicData.check'), width: '80' },
  { type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
  {field: 'returnQuantity', width:'150', title: t('mainIngredientStock.returnQuantity'), sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } }},
  {field: 'dateOfManufacture', width:'150', title: t('mainIngredientStock.dateOfManufacture'), sortable: true,editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},},
  {field: 'returnQuantity', width:'150', title: t('ingredientsStock.returnQuantity'), sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } }},
  {field: 'dateOfManufacture', width:'150', title: t('ingredientsStock.dateOfManufacture'), sortable: true,editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},},

  {field: 'inventoryOrganization', width:'150', title: t('mainIngredientStock.inventoryOrganization'), sortable: true,folding: true,slots: { edit: 'inventoryOrganization'},editRender: { name: '$select', attrs: { placeholder: '' } }},
  {field: 'producer', width:'150', title: t('mainIngredientStock.producer'), sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } }},
  {field: 'qualityGuaranteePeriod', width:'150', title: t('mainIngredientStock.qualityGuaranteePeriod'), sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } }},
  {field: 'inventoryOrganization', width:'150', title: t('ingredientsStock.inventoryOrganization'), sortable: true,folding: true,slots: { edit: 'inventoryOrganization'},editRender: { name: '$select', attrs: { placeholder: '' } }},
  {field: 'producer', width:'150', title: t('ingredientsStock.producer'), sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } }},
  {field: 'qualityGuaranteePeriod', width:'150', title: t('ingredientsStock.qualityGuaranteePeriod'), sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } }},
  {field: 'inventoryArea', width:'150', title: t('productStock.inventoryArea'),sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } }},

  {field: 'remarks',width: '80', title: t('basicData.remarks'), sortable: true,editRender: { name: 'input', attrs: { placeholder: '' } }},
  {field: 'id', width: '150',title: t('mainIngredient.materialCode'), sortable: true,showOverflow:'ellipsis' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
  {field: 'id', width: '150',title: t('ingredients.materialCode'), sortable: true,showOverflow:'ellipsis' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
]




//页面第一次加载
request.get(`/BasicWarehouse/BasicWarehouseTypes/`+t('mainIngredientStock.inventoryOrganization')+'|'+t('mainIngredientStock.materialReturnType')).then((res) => {
request.get(`/BasicWarehouse/BasicWarehouseTypes/`+t('ingredientsStock.inventoryOrganization')+'|'+t('ingredientsStock.materialReturnType')).then((res) => {

  if(res.code==200){
    titleSelectJson.value=deepClone(res.data)
@@ -127,12 +127,12 @@
  if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
    filterData.value.returningId=str
    //第一次调用
    request.post("/MaterialInventory/getSelectReturningWarehouse/1/100",filterData.value).then((res) => {
    request.post("/materialInventory/getSelectReturningWarehouse/1/100",filterData.value).then((res) => {

      if(res.code==200){
        titleUploadData.value=deepClone(res.data.returningWarehouse)
        //根据审核状态显示审核按钮或者是反审按钮
        value.value=t('mainIngredient.originalFilm')+'|'+t('mainIngredient.accessories')
        value.value=t('ingredients.originalFilm')+'|'+t('ingredients.accessories')
        getStoreWork()
        if(titleUploadData.value.reviewedState!==0){
          gridOptions.toolbarConfig.buttons[1].disabled = true
@@ -166,7 +166,7 @@
    })
  }else{
    //返库新增
    request.post(`/MaterialStore/getSelectMaterialStore/1/100`,filterData.value).then((res) => {
    request.post(`/materialStore/getSelectMaterialStore/1/100`,filterData.value).then((res) => {

      if(res.code==200){

@@ -179,7 +179,7 @@
        //显示复选框
        xGrid.value.showColumn("select")

        value.value=t('mainIngredient.originalFilm')
        value.value=t('ingredients.originalFilm')
        getStoreWork()

        getStoreWorks()
@@ -198,7 +198,7 @@
//库存组织
const getInventoryOrganization=()=>{
  //页面第一次加载
  request.get(`/BasicWarehouse/BasicWarehouseTypes//`+t('mainIngredientStock.inventoryOrganization')+'|'+t('mainIngredientStock.materialReturnType')).then((res) => {
  request.get(`/BasicWarehouse/BasicWarehouseTypes//`+t('ingredientsStock.inventoryOrganization')+'|'+t('ingredientsStock.materialReturnType')).then((res) => {

    if(res.code==200){
      titleSelectJson.value=deepClone(res.data)
@@ -251,7 +251,7 @@

//数据绑定
const getStoreWorks = () => {
  request.post(`/MaterialStore/getSelectMaterialStore/1/100`,filterData.value).then((res) => {
  request.post(`/materialStore/getSelectMaterialStore/1/100`,filterData.value).then((res) => {

    if(res.code==200){
      materialStore.value=[]
@@ -260,11 +260,11 @@
        materialStore.value[i].json=(JSON.parse(res.data.data[i].json))

      }
      if(value.value===t('mainIngredient.originalFilm')){
      if(value.value===t('ingredients.originalFilm')){
        materialStore.value.forEach(item => {
          item['inventoryOrganization'] = titleSelectJson.value["inventoryOrganization"][0].operateTypeName
        })
      }else if(value.value===t('mainIngredient.accessories')){
      }else if(value.value===t('ingredients.accessories')){
        materialStore.value.forEach(item => {
          item['inventoryOrganization'] = titleSelectJson.value["inventoryOrganization"][1].operateTypeName
        })
@@ -308,12 +308,12 @@
          }
          const materialRequisitionPersonnel = titleUploadData.value.materialRequisitionPersonnel
          if(materialRequisitionPersonnel === null || materialRequisitionPersonnel === undefined || materialRequisitionPersonnel === ''){
            ElMessage.error(t('mainIngredientStock.materialRequisitionPersonnel'))
            ElMessage.error(t('ingredientsStock.materialRequisitionPersonnel'))
            return
          }
          const materialRequisitionTeam = titleUploadData.value.materialRequisitionTeam
          if(materialRequisitionTeam === null || materialRequisitionTeam === undefined || materialRequisitionTeam === ''){
            ElMessage.error(t('mainIngredientStock.materialRequisitionTeam'))
            ElMessage.error(t('ingredientsStock.materialRequisitionTeam'))
            return
          }
          const orderId = titleUploadData.value.orderId
@@ -341,7 +341,7 @@
            returningId: route.query.returningId

          })
          request.post("/MaterialInventory/saveReturningWarehouse", flowData.value).then((res) => {
          request.post("/materialInventory/saveReturningWarehouse", flowData.value).then((res) => {
            if(res.code==200 && res.data===true){
              ElMessage.success(t('basicData.msg.saveSuccess'))
              router.push({path: '/main/ingredientsStock/ReturnToStorage', query:{random:Math.random()}})
@@ -361,7 +361,7 @@
            type: 1

          })
          request.post("/MaterialInventory/updateReturningWarehouseToExamine", flowData.value).then((res) => {
          request.post("/materialInventory/updateReturningWarehouseToExamine", flowData.value).then((res) => {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.ReviewSuccess'))
              router.push({path: '/main/ingredientsStock/ReturnToStorage', query:{random:Math.random()}})
@@ -380,7 +380,7 @@
            type: 0

          })
          request.post("/MaterialInventory/updateReturningWarehouseToExamine", flowData.value).then((res) => {
          request.post("/materialInventory/updateReturningWarehouseToExamine", flowData.value).then((res) => {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
              router.push({path: '/main/ingredientsStock/ReturnToStorage', query:{random:Math.random()}})
@@ -501,7 +501,7 @@
  returnQuantity: [{
    validator (e) {
     if (e.row.returnQuantity ==="") {
        return new Error(t('mainIngredientStock.theReturnQuantityCannotBeEmptyOrEqualTo0'))
        return new Error(t('ingredientsStock.theReturnQuantityCannotBeEmptyOrEqualTo0'))
      }
      const regex = /^[1-9]\d*$/g
      if ( !regex.test(e.row.returnQuantity) ) {
@@ -521,17 +521,17 @@

    <div class="order-primary" style="background-color: white">
      <el-row>
        <el-col  :span="2"><el-text>{{$t('mainIngredientStock.createTime')}}:</el-text></el-col>
        <el-col  :span="2"><el-text>{{$t('ingredientsStock.createTime')}}:</el-text></el-col>
        <el-col  :span="3"><el-input  v-model="titleUploadData.createTime" :readonly="true" ></el-input></el-col>
        <el-col  :span="2"><el-text>{{$t('mainIngredientStock.materialRequisitionPersonnel')}}:</el-text></el-col>
        <el-col  :span="2"><el-text>{{$t('ingredientsStock.materialRequisitionPersonnel')}}:</el-text></el-col>
        <el-col  :span="3"><el-input v-model="titleUploadData.materialRequisitionPersonnel" /></el-col>
        <el-col  :span="2"><el-text>{{$t('mainIngredientStock.materialRequisitionTeam')}}:</el-text></el-col>
        <el-col  :span="2"><el-text>{{$t('ingredientsStock.materialRequisitionTeam')}}:</el-text></el-col>
        <el-col  :span="3"><el-input v-model="titleUploadData.materialRequisitionTeam" /></el-col>
        <el-col  :span="2"><el-text>{{$t('mainIngredientStock.warehouseManager')}}:</el-text></el-col>
        <el-col  :span="2"><el-text>{{$t('ingredientsStock.warehouseManager')}}:</el-text></el-col>
        <el-col  :span="3"><el-input v-model="titleUploadData.warehouseManager" :readonly="true" /></el-col>
      </el-row>
      <el-row>
        <el-col  :span="2"><el-text>{{$t('mainIngredientStock.returningType')}}：</el-text></el-col>
        <el-col  :span="2"><el-text>{{$t('ingredientsStock.returningType')}}：</el-text></el-col>
        <el-col  :span="3">
          <el-select v-model="titleUploadData.returningType"  clearable :placeholder="$t('processCard.pleaseSelect')"  >
            <el-option
@@ -554,7 +554,7 @@


      <el-row>
        <el-select v-model="value" :placeholder="$t('mainIngredient.pleaseSelectACategory')" @change="getWork" style="margin-top: 10px;border: #181818 1px solid;">
        <el-select v-model="value" :placeholder="$t('ingredients.pleaseSelectACategory')" @change="getWork" style="margin-top: 10px;border: #181818 1px solid;">
          <el-option
              v-for="item in options"
              :key="item.value"

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

@@ -62,12 +62,12 @@
const values = ref('')
const selectOptions = [
  {
    value: t('mainIngredientStock.inventory'),
    label: t('mainIngredientStock.inventory')
    value: t('ingredientsStock.inventory'),
    label: t('ingredientsStock.inventory')
  },
  {
    value: t('mainIngredientStock.engineering'),
    label: t('mainIngredientStock.engineering'),
    value: t('ingredientsStock.engineering'),
    label: t('ingredientsStock.engineering'),
  }
]

@@ -80,18 +80,18 @@

  { type: 'checkbox',fixed:"left", title: t('basicData.check'), width: '80' },
  { type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
  {field: 'inventoryOrganization', width:'150', title: t('mainIngredientStock.inventoryOrganization'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged },
  {field: 'materialCode', width: '150',title: t('mainIngredient.materialCode'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'producer', width: '100',title: t('mainIngredientStock.producer'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'id',width: '100', title: t('mainIngredientStock.id'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'projectNo',width: '100', title: t('mainIngredientStock.projectNo'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'inventoryOrganization', width:'150', title: t('ingredientsStock.inventoryOrganization'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged },
  {field: 'materialCode', width: '150',title: t('ingredients.materialCode'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'producer', width: '100',title: t('ingredientsStock.producer'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'id',width: '100', title: t('ingredientsStock.id'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'projectNo',width: '100', title: t('ingredientsStock.projectNo'), 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: t('productStock.inventoryQuantity'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'availableQuantity', width: '100',title: t('productStock.availableQuantity'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'planQuantity', width: '100',title: t('mainIngredientStock.planQuantity'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'planQuantity', width: '100',title: t('ingredientsStock.planQuantity'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'totalArea',width: '100', title: t('order.grossArea'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'dateOfManufacture',width: '100', title: t('mainIngredientStock.dateOfManufacture'), sortable: true},
  {field: 'qualityGuaranteePeriod',width: '100', title: t('mainIngredientStock.qualityGuaranteePeriod'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'dateOfManufacture',width: '100', title: t('ingredientsStock.dateOfManufacture'), sortable: true},
  {field: 'qualityGuaranteePeriod',width: '100', title: t('ingredientsStock.qualityGuaranteePeriod'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'inventoryArea',width: '100', title: t('productStock.inventoryArea'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  //{field: 'deadStock',width: '100', title: '积压库存', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
  {field: 'createTime',width: '100', title: t('productStock.storageTime'), sortable: true},
@@ -102,7 +102,7 @@



request.get(`/BasicWarehouse/BasicWarehouseType/`+t('mainIngredient.originalFilm')+'|'+t('mainIngredient.accessories')).then((res) => {
request.get(`/BasicWarehouse/BasicWarehouseType/`+t('ingredients.originalFilm')+'|'+t('ingredients.accessories')).then((res) => {
  if(res.code==200){
    gridOptions.columns.splice(0,gridOptions.columns.length)
    BasicData.value = res.data
@@ -114,7 +114,7 @@
      gridOptions.columns.push(aa)

    }
    values.value=t('mainIngredientStock.inventory')
    values.value=t('ingredientsStock.inventory')
    getInventoryWorks()

  }else{
@@ -126,7 +126,7 @@

const getInventoryWorks = () => {

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

    if(res.code==200){
      materialStore.value=[]
@@ -151,7 +151,7 @@
}

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

    if(res.code==200){
      materialStore.value=[]
@@ -175,7 +175,7 @@
}

const selectInventoryWork = () => {
  if(values.value===t('mainIngredientStock.inventory')){
  if(values.value===t('ingredientsStock.inventory')){
    getInventoryWorks()
  }else{
    getInventoryEngineeringWork()
@@ -184,7 +184,7 @@

const getInventoryEngineeringWork = () => {

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

      if(res.code==200){
        materialStore.value=[]
@@ -213,7 +213,7 @@


const selectOrderList = ()=>{
  request.get(`/BasicWarehouse/BasicWarehouseType/`+t('mainIngredient.originalFilm')+'|'+t('mainIngredient.accessories')).then((res) => {
  request.get(`/BasicWarehouse/BasicWarehouseType/`+t('ingredients.originalFilm')+'|'+t('ingredients.accessories')).then((res) => {
    if(res.code==200){
      gridOptions.columns.splice(0,gridOptions.columns.length)
      BasicData.value = res.data
@@ -226,7 +226,7 @@
        gridOptions.columns.push(aa)

      }
      if(values.value===t('mainIngredientStock.inventory')){
      if(values.value===t('ingredientsStock.inventory')){
        getInventoryWorkPaging()
      }else{
        getInventoryEngineeringWork()
@@ -286,8 +286,8 @@
  ],//表头按钮
  toolbarConfig: {
    buttons: [
      {'code': 'out', 'name': t('mainIngredientStock.materialOutbound'),status: 'primary'},
      {'code': 'add', 'name': t('mainIngredient.materialAddition'),status: 'primary'},
      {'code': 'out', 'name': t('ingredientsStock.materialOutbound'),status: 'primary'},
      {'code': 'add', 'name': t('ingredients.materialAddition'),status: 'primary'},
    ],
    /*import: false,
    export: true,
@@ -327,7 +327,7 @@
          }
          let id = ""
          const array = [];
          if (values.value===t('mainIngredientStock.inventory')){
          if (values.value===t('ingredientsStock.inventory')){
            for (let i = 0; i < selectRecords.length; i++) {
              array.push(selectRecords[i].id)
              if (i + 1 === selectRecords.length) {
@@ -359,8 +359,8 @@
          dialogTableVisible.value=true
          select()
          //第一次加载默认
          value.value=t('mainIngredient.originalFilm')
          filterData.value.type=t('mainIngredient.originalFilm')
          value.value=t('ingredients.originalFilm')
          filterData.value.type=t('ingredients.originalFilm')
          request.get(`/BasicWarehouse/BasicWarehouseType/${value.value}`).then((res) => {
            if(res.code==200){
              gridOption.columns.splice(0,gridOption.columns.length)
@@ -394,18 +394,18 @@
let arrs = [
  { type: 'radio',fixed:"left", title: t('basicData.check'), width: '80' },
  { type: 'seq',fixed:'left', title: t('basicData.Number'), width: '80' },
  {field: 'id', width: '150',title: t('mainIngredient.materialCode'), sortable: true,showOverflow:'ellipsis' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
  {field: 'id', width: '150',title: t('ingredients.materialCode'), sortable: true,showOverflow:'ellipsis' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
]

const value = ref('')
const options = [
  {
    value: t('mainIngredient.originalFilm'),
    label: t('mainIngredient.originalFilm')
    value: t('ingredients.originalFilm'),
    label: t('ingredients.originalFilm')
  },
  {
    value: t('mainIngredient.accessories'),
    label: t('mainIngredient.accessories'),
    value: t('ingredients.accessories'),
    label: t('ingredients.accessories'),
  }
]

@@ -476,7 +476,7 @@
})

const select=() =>{
  request.get(`/BasicWarehouse/BasicWarehouseTypes/`+t('mainIngredientStock.inventoryOrganization')).then((res) => {
  request.get(`/BasicWarehouse/BasicWarehouseTypes/`+t('ingredientsStock.inventoryOrganization')).then((res) => {

    if(res.code==200){
      titleSelectJson.value=deepClone(res.data)
@@ -507,7 +507,7 @@
        gridOption.columns.push(column)

      }
      if(value.value==t('mainIngredient.accessories')){
      if(value.value==t('ingredients.accessories')){
        titleUploadData.value.inventoryOrganization=titleSelectJson.value.inventoryOrganization[1].operateTypeName
      }else{
        titleUploadData.value.inventoryOrganization=titleSelectJson.value.inventoryOrganization[0].operateTypeName
@@ -523,7 +523,7 @@

//数据绑定
const getStoreWorks = () => {
  request.post(`/MaterialStore/getSelectMaterialStore/1/${total.pageSize}`,filterDatas.value).then((res) => {
  request.post(`/materialStore/getSelectMaterialStore/1/${total.pageSize}`,filterDatas.value).then((res) => {

    if(res.code==200){
      materialStores.value=[]
@@ -564,12 +564,12 @@
          //表头数据校验
          const outboundType = titleUploadData.value.inventoryOrganization
          if(outboundType === null || outboundType === undefined || outboundType === ''){
            ElMessage.error(t('mainIngredientStock.pleaseSelectInventoryOrganization'))
            ElMessage.error(t('ingredientsStock.pleaseSelectInventoryOrganization'))
            return
          }
          const materialRequisitionPersonnel = titleUploadData.value.inventoryQuantity
          if(materialRequisitionPersonnel === null || materialRequisitionPersonnel === undefined || materialRequisitionPersonnel === ''){
            ElMessage.error(t('mainIngredientStock.pleaseEnterTheQuantity'))
            ElMessage.error(t('ingredientsStock.pleaseEnterTheQuantity'))
            return
          }
          const  dateOfManufacture= titleUploadData.value.dateOfManufacture
@@ -592,7 +592,7 @@

          })

          request.post("/MaterialInventory/saveMaterialInventory", flowData.value).then((res) => {
          request.post("/materialInventory/saveMaterialInventory", flowData.value).then((res) => {
            if(res.code==200){
              ElMessage.success(t('basicData.msg.saveSuccess'))
              router.push({path: '/main/ingredientsStock/SelectIngredientsStock', query:{random:Math.random()}})
@@ -628,7 +628,7 @@
      <el-button @click="changeDate" style="margin-top: -5px"  id="searchButton" type="primary" :icon="Search">{{$t('basicData.search')}}</el-button>
      <div>
        <el-row>
          <el-select v-model="values" :placeholder="$t('mainIngredient.pleaseSelectACategory')" @change="selectInventoryWork">
          <el-select v-model="values" :placeholder="$t('ingredients.pleaseSelectACategory')" @change="selectInventoryWork">
            <el-option
                v-for="item in selectOptions"
                :key="item.value"
@@ -693,27 +693,27 @@
      </vxe-grid>
    </div>

    <el-dialog v-model="dialogTableVisible" :title="$t('mainIngredient.materialAddition')" style="width: 70%;height:75% ">
    <el-dialog v-model="dialogTableVisible" :title="$t('ingredients.materialAddition')" style="width: 70%;height:75% ">
      <div class="order-primary" >
        <el-row>
          <el-col  :span="2"><el-text>{{$t('mainIngredientStock.dateOfManufacture')}}:</el-text></el-col>
          <el-col  :span="2"><el-text>{{$t('ingredientsStock.dateOfManufacture')}}:</el-text></el-col>
          <el-col  :span="4">
            <el-date-picker
                v-model="titleUploadData.dateOfManufacture"
                type="date"
                format="YYYY-MM-DD"
                value-format="YYYY-MM-DD"
                :placeholder="$t('mainIngredientStock.pleaseDateOfManufacture')"/>
                :placeholder="$t('ingredientsStock.pleaseDateOfManufacture')"/>
          </el-col>

          <el-col  :span="2"><el-text>{{$t('mainIngredientStock.qualityGuaranteePeriod')}}:</el-text></el-col>
          <el-col  :span="2"><el-text>{{$t('ingredientsStock.qualityGuaranteePeriod')}}:</el-text></el-col>
          <el-col  :span="3"><el-input v-model="titleUploadData.qualityGuaranteePeriod" /></el-col>
          <el-col  :span="1"><el-text>{{$t('mainIngredientStock.producer')}}:</el-text></el-col>
          <el-col  :span="1"><el-text>{{$t('ingredientsStock.producer')}}:</el-text></el-col>
          <el-col  :span="3"><el-input v-model="titleUploadData.producer" /></el-col>

        </el-row>
        <el-row>
          <el-col  :span="2"><el-text>{{$t('mainIngredientStock.inventoryOrganization')}}：</el-text></el-col>
          <el-col  :span="2"><el-text>{{$t('ingredientsStock.inventoryOrganization')}}：</el-text></el-col>
          <el-col  :span="4">
            <el-select v-model="titleUploadData.inventoryOrganization"  clearable :placeholder="$t('processCard.pleaseSelect')"  >
              <el-option
@@ -735,7 +735,7 @@
      </div>
      <div>
        <el-row>
            <el-select v-model="value" :placeholder="$t('mainIngredientStock.pleaseSelectACategory')" @change="getStoreWork">
            <el-select v-model="value" :placeholder="$t('ingredientsStock.pleaseSelectACategory')" @change="getStoreWork">
              <el-option
                  v-for="item in options"
                  :key="item.value"

 north-glass-erp/northglass-erp/src/views/mm/ingredientStock/SelectSurplusMaterials.vue

@@ -68,7 +68,7 @@



request.post(`/MaterialInventory/getSelectSurplusMaterialsDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
request.post(`/materialInventory/getSelectSurplusMaterialsDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  if(res.code==200){
    total.dataTotal = res.data.total.total*1
    total.pageTotal= res.data.total.pageTotal
@@ -86,7 +86,7 @@


const selectOrderList = ()=>{
  request.post(`/MaterialInventory/getSelectSurplusMaterialsDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/materialInventory/getSelectSurplusMaterialsDate/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
    if(res.code==200){
      selectDate.value = res.data.selectDate

@@ -153,7 +153,7 @@
    {field: 'width', width:'150', title: t('order.width'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged },
    {field: 'height', width: '150',title: t('order.height'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'thickness', width: '100',title: t('product.msg.allThickness'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'colour',width: '150', title: t('mainIngredient.films'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'colour',width: '150', title: t('ingredients.films'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'quantity',width: '150', title: t('order.quantity'),editRender: { name: 'input' }, sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'createTime',width: '150', title: t('productStock.storageTime'), sortable: true},
    {field: 'remarks',width: '150', title: t('basicData.remarks'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
@@ -161,8 +161,8 @@
  ],//表头按钮
  toolbarConfig: {
    buttons: [
      {'code': 'out', 'name': t('mainIngredientStock.excessMaterialOutflow'),status: 'primary'},
      {'code': 'add', 'name': t('mainIngredientStock.additionOfSurplusMaterials'),status: 'primary'},
      {'code': 'out', 'name': t('ingredientsStock.excessMaterialOutflow'),status: 'primary'},
      {'code': 'add', 'name': t('ingredientsStock.additionOfSurplusMaterials'),status: 'primary'},
    ],
    /*import: false,
    export: true,
@@ -229,7 +229,7 @@
            surplusMaterials: selectRecords,
            state:2
          })
          request.post("/MaterialInventory/addSelectSurplusMaterialsDate",flowData.value).then((res) => {
          request.post("/materialInventory/addSelectSurplusMaterialsDate",flowData.value).then((res) => {
            if(res.code==200 && res.data===true){
              ElMessage.success(t('basicData.msg.saveSuccess'))
              router.push({path:'/main/ingredientsStock/selectSurplusMaterials',query:{random:Math.random()}})
@@ -289,7 +289,7 @@
    type:t('searchOrder.storage'),
    state:1
  })
  request.post("/MaterialInventory/addSelectSurplusMaterialsDate",flowData.value).then((res) => {
  request.post("/materialInventory/addSelectSurplusMaterialsDate",flowData.value).then((res) => {
    if(res.code==200 && res.data===true){
      ElMessage.success(t('basicData.msg.saveSuccess'))
      router.push({path:'/main/ingredientsStock/selectSurplusMaterials',query:{random:Math.random()}})
@@ -376,24 +376,24 @@

    </vxe-grid>

    <el-dialog v-model="dialogTableVisible" :title="$t('mainIngredientStock.additionOfSurplusMaterials')" style="width: 70%;height:75% ">
    <el-dialog v-model="dialogTableVisible" :title="$t('ingredientsStock.additionOfSurplusMaterials')" style="width: 70%;height:75% ">
      <div class="order-primary" >
        <el-row gutter="5">
          <el-col :span="4.5" >
            {{$t('order.width')}}：<el-input v-model="filterData1.width" :placeholder="$t('mainIngredient.pleaseEnterData')" style="width: 150px; height: 30px;" />
            {{$t('order.width')}}：<el-input v-model="filterData1.width" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
          </el-col>
          <el-divider ></el-divider>
          <el-col :span="4.5" >
            {{$t('order.height')}}：<el-input v-model="filterData1.height" :placeholder="$t('mainIngredient.pleaseEnterData')" style="width: 150px; height: 30px;" />
            {{$t('order.height')}}：<el-input v-model="filterData1.height" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
          </el-col>
          <el-divider ></el-divider>
          <el-col :span="4.5" >
            {{$t('product.msg.allThickness')}}：<el-input v-model="filterData1.thickness" :placeholder="$t('mainIngredient.pleaseEnterData')" style="width: 150px; height: 30px;" />
            {{$t('product.msg.allThickness')}}：<el-input v-model="filterData1.thickness" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
          </el-col>
          <el-divider ></el-divider>
          <el-col :span="4.5" >
            {{$t('mainIngredient.films')}}：
            <el-select filterable v-model="filterData1.colour"  :placeholder="$t('mainIngredient.pleaseEnterData')" style="width: 150px; height: 30px;" >
            {{$t('ingredients.films')}}：
            <el-select filterable v-model="filterData1.colour"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" >
              <el-option
                  v-for="item in titleSelectJson"
                  :key="item.id"
@@ -404,7 +404,7 @@
          </el-col>
          <el-divider ></el-divider>
          <el-col :span="4.5" >
            {{$t('order.quantity')}}：<el-input v-model="filterData1.quantity" :placeholder="$t('mainIngredient.pleaseEnterData')" style="width: 150px; height: 30px;" />
            {{$t('order.quantity')}}：<el-input v-model="filterData1.quantity" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
          </el-col>
          <el-divider ></el-divider>
        </el-row>

 north-glass-erp/northglass-erp/src/views/mm/productStock/CreateProductStock.vue

@@ -86,7 +86,7 @@


//第一次调用
request.post(`/FinishedGoodsInventory/getSelectWarehousing/1/${total.pageSize}`,filterData.value).then((res) => {
request.post(`/finishedGoodsInventory/getSelectWarehousing/1/${total.pageSize}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -124,7 +124,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getSelectWarehousing/1/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectWarehousing/1/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -141,7 +141,7 @@
}
const selectOrderList = ()=>{

  request.post(`/FinishedGoodsInventory/getSelectWarehousing/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectWarehousing/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      produceList = deepClone(res.data.data)
@@ -279,7 +279,7 @@
              flowCard: selectRecords
            })

            request.post("/FinishedGoodsInventory/addSelectWarehousing",flowData.value).then((res) => {
            request.post("/finishedGoodsInventory/addSelectWarehousing",flowData.value).then((res) => {
              if(res.code==200 && res.data==="true"){
                ElMessage.success(t('productStock.receivedSuccessfully'))
                router.push({path:'/main/productStock/CreateProductStock',query:{random:Math.random()}})

 north-glass-erp/northglass-erp/src/views/mm/productStock/FinishedGoodsIssue.vue

@@ -66,7 +66,7 @@
            orderDetail:selectRecords

          })
          request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryTakeOut",flowData.value).then((res) => {
          request.post("/finishedGoodsInventory/updateFinishedGoodsInventoryTakeOut",flowData.value).then((res) => {
            if(res.code==200 && res.data===true){
              ElMessage.success(t('productStock.successfullyRetrieved'))
              router.push({path:'/main/productStock/FinishedGoodsIssue',query:{random:Math.random()}})
@@ -169,7 +169,7 @@
  pageSize : 100
})
//第一次调用
request.post(`/FinishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {
request.post(`/finishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -207,7 +207,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -225,7 +225,7 @@


const selectOrderList = ()=>{
  request.post(`/FinishedGoodsInventory/getSelectAllocate/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectAllocate/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      if (res.data.total!=null){

 north-glass-erp/northglass-erp/src/views/mm/productStock/FinishedProductOut.vue

@@ -91,7 +91,7 @@


//第一次调用
request.post(`/FinishedGoodsInventory/getSelectDeliveryDetail/1/${total.pageSize}`,filterData.value).then((res) => {
request.post(`/finishedGoodsInventory/getSelectDeliveryDetail/1/${total.pageSize}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -127,7 +127,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getSelectDeliveryDetail/1/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectDeliveryDetail/1/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -146,7 +146,7 @@

const selectOrderList = ()=>{

  request.post(`/FinishedGoodsInventory/getSelectDeliveryDetail/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectDeliveryDetail/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      if (res.data.total!=null){
@@ -285,7 +285,7 @@
              userName: username,
              orderDetail: selectRecords
            })
            request.post("/FinishedGoodsInventory/addDeliveryDetail", orderDetailData.value).then((res) => {
            request.post("/finishedGoodsInventory/addDeliveryDetail", orderDetailData.value).then((res) => {
              if (res.code == 200 && res.data==="true") {
                ElMessage.success(t('productStock.deliverySuccessful'))
                router.push({path: '/main/productStock/FinishedProductOut', query: {random: Math.random()}})

 north-glass-erp/northglass-erp/src/views/mm/productStock/FinishedProductRework.vue

@@ -65,7 +65,7 @@
            orderDetail: selectRecords

          })
          request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryRework", flowData.value).then((res) => {
          request.post("/finishedGoodsInventory/updateFinishedGoodsInventoryRework", flowData.value).then((res) => {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('productStock.reworkSuccessful'))
              router.push({path:'/main/productStock/FinishedProductRework',query:{random:Math.random()}})
@@ -167,7 +167,7 @@
  pageSize : 100
})
//第一次调用
request.post(`/FinishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {
request.post(`/finishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -205,7 +205,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -223,7 +223,7 @@

const selectOrderList = ()=>{

  request.post(`/FinishedGoodsInventory/getSelectAllocate/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectAllocate/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      if (res.data.total!=null){

 north-glass-erp/northglass-erp/src/views/mm/productStock/OrderAllocation.vue

@@ -82,7 +82,7 @@
})

//第一次调用1
request.post(`/FinishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {
request.post(`/finishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -120,7 +120,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectAllocate/1/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -139,7 +139,7 @@

const selectOrderList = ()=>{

  request.post(`/FinishedGoodsInventory/getSelectAllocate/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectAllocate/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      if (res.data.total!=null){
@@ -280,7 +280,7 @@
              userName: username,
              orderDetail: selectRecords
            })
            request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryAllocate", flowData.value).then((res) => {
            request.post("/finishedGoodsInventory/updateFinishedGoodsInventoryAllocate", flowData.value).then((res) => {
              if (res.code == 200 && res.data===true) {

                ElMessage.success(t('productStock.transferSuccessful'))

 north-glass-erp/northglass-erp/src/views/mm/productStock/ProductStockList.vue

@@ -76,7 +76,7 @@


//第一次调用
request.post(`/FinishedGoodsInventory/getSelect/1/${total.pageSize}`,filterData.value).then((res) => {
request.post(`/finishedGoodsInventory/getSelect/1/${total.pageSize}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -114,7 +114,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getSelect/1/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelect/1/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -131,7 +131,7 @@

const selectOrderList = ()=>{

  request.post(`/FinishedGoodsInventory/getSelect/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelect/${pageNum.value}/${total.pageSize}`,filterData.value).then((res) => {

    if(res.code==200){
      if (res.data.total!=null){

 north-glass-erp/northglass-erp/src/views/mm/productStock/ReworkRecord.vue

@@ -68,7 +68,7 @@
let selectDate = ref(["",""])

//第一次调用
request.post(`/FinishedGoodsInventory/getSelectOperateRecord/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
request.post(`/finishedGoodsInventory/getSelectOperateRecord/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -107,7 +107,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getSelectOperateRecord/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectOperateRecord/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -127,7 +127,7 @@


const selectOrderList = ()=>{
  request.post(`/FinishedGoodsInventory/getSelectOperateRecord/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectOperateRecord/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
    if(res.code==200){
      if (res.data.total!=null){
        total.dataTotal = res.data.total.total*1
@@ -259,7 +259,7 @@
              orderDetail:selectRecords

            })
            request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryCounterExamination",flowData.value).then((res) => {
            request.post("/finishedGoodsInventory/updateFinishedGoodsInventoryCounterExamination",flowData.value).then((res) => {
              if(res.code==200 && res.data===true){
                ElMessage.success(t('productStock.reverseReviewSuccessful'))
                router.push({path:'/main/productStock/ReworkRecord',query:{random:Math.random()}})

 north-glass-erp/northglass-erp/src/views/mm/productStock/StorageRecord.vue

@@ -75,7 +75,7 @@
  if (typeof storageType !== 'undefined' && storageType !== null && storageType !== '' && storageType !== '\n' && storageType !== '\r'){
    type.value=storageType
    //第一次调用
    request.post(`/FinishedGoodsInventory/getSelectStorageRecord/1/${total.pageSize}/${selectDate.value}/${type.value}`,filterData.value).then((res) => {
    request.post(`/finishedGoodsInventory/getSelectStorageRecord/1/${total.pageSize}/${selectDate.value}/${type.value}`,filterData.value).then((res) => {

      if(res.code==200){
        total.dataTotal = res.data.total.total*1
@@ -116,7 +116,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getSelectStorageRecord/1/${total.pageSize}/${selectDate.value}/${type.value}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectStorageRecord/1/${total.pageSize}/${selectDate.value}/${type.value}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -137,7 +137,7 @@


const selectOrderList = ()=>{
  request.post(`/FinishedGoodsInventory/getSelectStorageRecord/${pageNum.value}/${total.pageSize}/${selectDate.value}/${type.value}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectStorageRecord/${pageNum.value}/${total.pageSize}/${selectDate.value}/${type.value}`,filterData.value).then((res) => {
    if(res.code==200){
      selectDate.value = res.data.selectDate
      if (res.data.total!=null){
@@ -278,7 +278,7 @@
              orderDetail:selectRecords

            })
            request.post("/FinishedGoodsInventory/cancelFinishedGoodsInventoryStorage",flowData.value).then((res) => {
            request.post("/finishedGoodsInventory/cancelFinishedGoodsInventoryStorage",flowData.value).then((res) => {
              if(res.code==200 && res.data===true){
                ElMessage.success(t('productStock.invalidSuccessfully'))
                router.push({path:'/main/productStock/storageRecord',query:{random:Math.random(),storageType: type.value}})

 north-glass-erp/northglass-erp/src/views/mm/productStock/TakeOutRecord.vue

@@ -69,7 +69,7 @@
})

//第一次调用
request.post(`/FinishedGoodsInventory/getSelectOperateRecord/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
request.post(`/finishedGoodsInventory/getSelectOperateRecord/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -105,7 +105,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getSelectOperateRecord/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectOperateRecord/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -126,7 +126,7 @@


const selectOrderList = ()=>{
  request.post(`/FinishedGoodsInventory/getSelectOperateRecord/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectOperateRecord/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
    if(res.code==200){
      selectDate.value = res.data.selectDate

@@ -271,7 +271,7 @@
              orderDetail:selectRecords

            })
            request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryToExamine",flowData.value).then((res) => {
            request.post("/finishedGoodsInventory/updateFinishedGoodsInventoryToExamine",flowData.value).then((res) => {
              if(res.code==200 && res.data===true){
                ElMessage.success(t('productStock.reviewSuccessful'))
                router.push({path:'/main/productStock/TakeOutRecord',query:{random:Math.random()}})
@@ -308,7 +308,7 @@
              orderDetail:selectRecords

            })
            request.post("/FinishedGoodsInventory/cancelFinishedGoodsInventoryToExamine",flowData.value).then((res) => {
            request.post("/finishedGoodsInventory/cancelFinishedGoodsInventoryToExamine",flowData.value).then((res) => {
              if(res.code==200 && res.data===true){
                ElMessage.success(t('productStock.invalidSuccessfully'))
                router.push({path:'/main/productStock/TakeOutRecord',query:{random:Math.random()}})

 north-glass-erp/northglass-erp/src/views/mm/productStock/TransferRecord.vue

@@ -69,7 +69,7 @@
})

//第一次调用
request.post(`/FinishedGoodsInventory/getSelectAllocateFinishedOperateLog/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
request.post(`/finishedGoodsInventory/getSelectAllocateFinishedOperateLog/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -108,7 +108,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/FinishedGoodsInventory/getSelectAllocateFinishedOperateLog/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectAllocateFinishedOperateLog/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -129,7 +129,7 @@


const selectOrderList = ()=>{
  request.post(`/FinishedGoodsInventory/getSelectAllocateFinishedOperateLog/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {
  request.post(`/finishedGoodsInventory/getSelectAllocateFinishedOperateLog/${pageNum.value}/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

    if(res.code==200){

@@ -250,7 +250,7 @@
              orderDetail:selectRecords

            })
            request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryCounterExamination",flowData.value).then((res) => {
            request.post("/finishedGoodsInventory/updateFinishedGoodsInventoryCounterExamination",flowData.value).then((res) => {
              if(res.code==200 && res.data===true){
                ElMessage.success(t('productStock.reverseReviewSuccessful'))
                router.push({path:'/main/productStock/TransferRecord',query:{random:Math.random()}})

 north-glass-erp/northglass-erp/src/views/mm/stockReport/StockMonthReport.vue

@@ -28,7 +28,7 @@

  ],//表格表头字段
  data:[],//表格数据
  url :'/FinishedGoodsInventory/getSelectFinishedOperateLogReport',
  url :'/finishedGoodsInventory/getSelectFinishedOperateLogReport',
  footList:['quantity']
})


 north-glass-erp/northglass-erp/src/views/mm/stockReport/StockWarehouseReport.vue

@@ -30,7 +30,7 @@

  ],//表格表头字段
  data:[],//表格数据
  url :'/FinishedGoodsInventory/getSelectFinishedOperateLogReport',
  url :'/finishedGoodsInventory/getSelectFinishedOperateLogReport',
  footList:['quantity']
})


 north-glass-erp/northglass-erp/src/views/mm/stockReport/WarehouseReport.vue

@@ -14,7 +14,7 @@
    {field: 'operationOrderNumber', width:'150', title: t('productStock.operationOrderNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderId', width: '150',title: t('order.orderId'),showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operationNumber', width: '100',title: t('order.OrderNum'), showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operateType', width: '120',title:t('mainBasicData.type'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operateType', width: '120',title:t('warehouseBasicData.type'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'quantity', width: '140',title: t('order.quantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.productId',width: '100', title: t('order.productId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'orderDetail.productName',width: '140', title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -32,8 +32,8 @@

  ],//表格表头字段
  data:[],//表格数据
  url :'/FinishedGoodsInventory/getSelectFinishedOperateLogReport',
  exportUrl :'/FinishedGoodsInventory/exportFinishedOperateLogReport',
  url :'/finishedGoodsInventory/getSelectFinishedOperateLogReport',
  exportUrl :'/finishedGoodsInventory/exportFinishedOperateLogReport',
  exportName:t('report.finishedProductReport'),
  footList:['quantity']
})

 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectPrintProject.vue

@@ -146,7 +146,7 @@
    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
    {
      field: 'project_no',
      title: t('mainIngredientStock.projectNo'),
      title: t('ingredientsStock.projectNo'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged

 north-glass-erp/northglass-erp/src/views/pp/report/RawMaterialRequisition.vue

@@ -214,12 +214,12 @@
      filterMethod: filterChanged
    },
    {
      field: 'material_name', width: 120, title: t('mainIngredientStock.materialName'), filters: [{data: ''}],
      field: 'material_name', width: 120, title: t('ingredientsStock.materialName'), filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
    {
      field: 'producer',title: t('mainIngredientStock.producer'), filters: [{data: ''}],
      field: 'producer',title: t('ingredientsStock.producer'), filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
    },
@@ -232,7 +232,7 @@
    {field: 'height',  title: t('order.height'), showOverflow: "ellipsis"},
    {field: 'quantity', title: t('report.quantityClaimed')},
    {field: 'area', title: t('report.areaClaimed')},
    {field: 'date_of_manufacture',  title: t('mainIngredientStock.dateOfManufacture')},
    {field: 'date_of_manufacture',  title: t('ingredientsStock.dateOfManufacture')},
    {field: 'date',  title: t('report.dateClaimed')},
  ],//表头按钮


 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -159,7 +159,7 @@
    filterData.value.orderId=orderId
    number.value=orderId
    //第一次调用
    request.post("/Delivery/getSelectShippingOrderDetails/1/100",filterData.value).then((res) => {
    request.post("/delivery/getSelectShippingOrderDetails/1/100",filterData.value).then((res) => {

      if(res.code==200){
        pageTotal.value=res.data.total
@@ -206,7 +206,7 @@
  if (typeof str != 'undefined' && str != null && str !== '' && str !== '\n' && str !== '\r'){
    filterData.value.deliveryDetail.deliveryId=str
    //第一次调用
    request.post("/Delivery/getSelectShippingOrderDetail/1/100",filterData.value).then((res) => {
    request.post("/delivery/getSelectShippingOrderDetail/1/100",filterData.value).then((res) => {

      if(res.code==200){
        pageTotal.value=res.data.total
@@ -421,7 +421,7 @@
            deliveryIdType:company.deliveryIdType

          })
           request.post("/Delivery/insertDelivery", flowData.value).then((res) => {
           request.post("/delivery/insertDelivery", flowData.value).then((res) => {
             if(res.code==200 && res.data==="true"){
               ElMessage.success(t('delivery.deliveryNoteSubmittedSuccessfully'))
               //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
@@ -453,7 +453,7 @@
            type: 2

          })
          request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
          request.post("/delivery/updateDeliveryToExamine", flowData.value).then((res) => {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.ReviewSuccess'))
              //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
@@ -475,7 +475,7 @@
            type: 0

          })
          request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
          request.post("/delivery/updateDeliveryToExamine", flowData.value).then((res) => {
            if (res.code == 200 && res.data===true) {
              ElMessage.success(t('basicData.msg.cancelReviewSuccess'))
              //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})

 north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryPrinting.vue

@@ -76,7 +76,7 @@
  form.value.deliveryId=route.query.deliveryID


  request.post(`/Delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
  request.post(`/delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
    if(res.code==200){
      produceList.value = deepClone(res.data.data)
      delivery.value=deepClone(res.data.delivery)

 north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryProductReport.vue

@@ -41,9 +41,9 @@

  ],//表格表头字段
  data:[],//表格数据
  url :'/Delivery/getSelectDeliveryDetailProductReport',
  exportUrl :'/Delivery/exportDeliveryDetailProductReport',
  exportName:t('delivery.shipmentProductClassificationReport'),
  url :'/delivery/getSelectDeliveryDetailProductReport',
  exportUrl :'/delivery/exportDeliveryDetailProductReport',
  exportName:t('delivery.page.shipmentProductClassificationReport'),
  footList:['quantity','area','money']
})


 north-glass-erp/northglass-erp/src/views/sd/delivery/DeliveryReport.vue

@@ -41,9 +41,9 @@

  ],//表格表头字段
  data:[],//表格数据
  url :'/Delivery/getSelectDeliveryDetailReport',
  exportUrl :'/Delivery/exportDeliveryDetailReport',
  exportName:t('delivery.shipmentDetailsReport'),
  url :'/delivery/getSelectDeliveryDetailReport',
  exportUrl :'/delivery/exportDeliveryDetailReport',
  exportName:t('delivery.page.shipmentDetailsReport'),
  footList:['quantity','area','money']
})


 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue

@@ -40,7 +40,7 @@
      let flowData = ref({
        deliveryId:row.deliveryId
      })
      request.post("/Delivery/deleteDelivery",flowData.value).then((res) => {
      request.post("/delivery/deleteDelivery",flowData.value).then((res) => {
        if(res.code==200 && res.data===true){
          ElMessage.success(t('searchOrder.msgDeleteSuccess'))
          router.push({path:'/main/delivery/selectDelivery',query:{random:Math.random()}})
@@ -90,7 +90,7 @@
})

//第一次调用
request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {
request.post(`/delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {

  if(res.code==200){
    console.log(res.data.data)
@@ -131,7 +131,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/Delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {
  request.post(`/delivery/getSelectShippingOrder/1/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {

    if(res.code==200){
      console.log(res.data.data)
@@ -150,7 +150,7 @@


const selectOrderList = ()=>{
  request.post(`/Delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {
  request.post(`/delivery/getSelectShippingOrder/${pageNum.value}/${total.pageSize}/${orderInfo.selectDeliveryDate}`,filterData.value).then((res) => {

    if(res.code==200){
      if (res.data.total!=null){
@@ -325,7 +325,7 @@
})

const printingNumber = ()=>{
    request.post(`/Delivery/updateDeliveryPrintNumber/${rowClickIndex.value.deliveryId}`).then(res =>{
    request.post(`/delivery/updateDeliveryPrintNumber/${rowClickIndex.value.deliveryId}`).then(res =>{
    })
}


 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectOrderList.vue

@@ -70,7 +70,7 @@


//第一次调用
request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${orderInfo.selectOrderListDate}`,filterData.value).then((res) => {
request.post(`/delivery/getSelectOrderInventory/1/${total.pageSize}/${orderInfo.selectOrderListDate}`,filterData.value).then((res) => {

  if(res.code==200){
    total.dataTotal = res.data.total.total*1
@@ -105,7 +105,7 @@
  }else{
    filterData.value[column.property] = value
  }
  request.post(`/Delivery/getSelectOrderInventory/1/${total.pageSize}/${orderInfo.selectOrderListDate}`,filterData.value).then((res) => {
  request.post(`/delivery/getSelectOrderInventory/1/${total.pageSize}/${orderInfo.selectOrderListDate}`,filterData.value).then((res) => {

    if(res.code==200){
      total.dataTotal = res.data.total.total*1
@@ -123,7 +123,7 @@
}

const selectOrderList = ()=>{
  request.post(`/Delivery/getSelectOrderInventory/${pageNum.value}/${total.pageSize}/${orderInfo.selectOrderListDate}`,filterData.value).then((res) => {
  request.post(`/delivery/getSelectOrderInventory/${pageNum.value}/${total.pageSize}/${orderInfo.selectOrderListDate}`,filterData.value).then((res) => {

    if(res.code==200){
      if (res.data.total!=null){

 north-glass-erp/northglass-erp/src/views/sd/order/OrderSummaryReport.vue

@@ -32,7 +32,7 @@
  data:[],//表格数据
  url :'/order/getOrderSummaryReport',
  exportUrl :'/order/exportOrderSummary',
  exportName:t('order.orderSummaryReport'),
  exportName:t('order.page.orderSummaryReport'),
  footList:['quantity','money','area','perimeter','otherMoney']
})


 north-glass-erp/northglass-erp/src/views/sd/order/SelectOrder.vue

@@ -292,7 +292,7 @@
              ElMessage.warning(t('order.orderHasBeenReceived'))
              return
            }
            request.post(`/FinishedGoodsInventory/oneClickStorage/${rowClickIndex.value.orderId}/${userStore.user.userName}`).then((res) => {
            request.post(`/finishedGoodsInventory/oneClickStorage/${rowClickIndex.value.orderId}/${userStore.user.userName}`).then((res) => {
              if(res.code==200 && res.data===true){
                ElMessage.success(t('productStock.receivedSuccessfully'))
                router.push({path:'/main/order/selectOrder',query:{random:Math.random()}})

 north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java

@@ -27,7 +27,7 @@
import java.util.Map;

@RestController
@RequestMapping("/FinishedGoodsInventory")
@RequestMapping("/finishedGoodsInventory")
@Api(value="成品库存controller",tags={"成品库存操作接口"})
public class FinishedGoodsInventoryController {
    @Autowired

 north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java

@@ -18,7 +18,7 @@
import java.util.Map;

@RestController
@RequestMapping("/MaterialInventory")
@RequestMapping("/materialInventory")
@Api(value="物料库存controller",tags={"物料库存操作接口"})
public class MaterialInventoryController {
    @Autowired

 north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java

@@ -28,7 +28,7 @@

@RestController
@Api(value="发货controller",tags={"发货操作接口"})
@RequestMapping("/Delivery")
@RequestMapping("/delivery")
public class DeliveryController {
    @Autowired
    DeliveryService deliveryService;