成品料架管理修改语言

廖井涛

2025-09-10 6c03d677d3db904af768dc0b925367b5892d739a

成品料架管理修改语言

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

@@ -1207,6 +1207,8 @@
        materialReturnReport:"物料返库报表",
        optimizeOutboundReport:"优化出库报表",
        optimizeQuantity:"优化使用数量",
        finishedGlassShelfEmitReport:"料架出库报表",
        finishedGlassShelfWithdrawReport:"料架入库报表",
    },
    components:{
        addNewSignature :'أضف اسم جديد',
@@ -1257,7 +1259,8 @@
        role :'أذونات الدور',
        userPassWord :'تغيير كلمة المرور',
        glassPrice:'玻璃价格',
        glassOptimize:'玻璃优化'
        glassOptimize:'玻璃优化',
        finishedGlassShelf:'成品料架'
    },

    glassPrice:{
@@ -1277,6 +1280,43 @@
        addProduce:'选择产品',
        reorder:'转订单',
        unit:'元/m²'
    },

    finishedGlassShelf:{
        finishedGlassShelfInformation:'料架库存',
        finishedGlassShelfEmit:'料架出库',
        finishedGlassShelfWithdraw:'料架入库',
        createFinishedGlassShelf:'料架新增',
        msg:{
            errorNotNull1:'料架编号不能为空',
            errorNotNull2:'料架名称不能为空',
            errorNotNull3:'数量不能为空',
            errorNotNull4:'单价不能为空',
            errorNotNull5:'单位不能为空',
            errorNotNull6:'最大承重不能为空',
            errorNotNull7:'最大宽不能为空',
            errorNotNull8:'最大高不能为空',
            pleaseWithdrawTime:'请输入归还日期',
            error1:'已存在归还数据无法删除!',
            error2:'请选中一行数据!',
            error3:'已全部归还!',

        },
        glassShelfNumber:'料架编号',
        glassShelfName:'料架名称',
        availableQuantity:'现有数量',
        totalQuantity:'总数量',
        maxWidth:'最大宽',
        maxHeight:'最大高',
        maxWeight:'最大承重',
        withdrawQuantity:'归还数量',
        withdrawTime:'归还日期',
        operator:'经办人',
        withdraw:'归还',
        emitId:'出库编号',
        withdrawId:'入库编号',
        returnDelivery:'返回发货',
        withdrawQuantity1:'待归还数量',
    }



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

@@ -1208,6 +1208,8 @@
        materialReturnReport:"Material return report",
        optimizeOutboundReport:"优化出库报表",
        optimizeQuantity:"优化使用数量",
        finishedGlassShelfEmitReport:"料架出库报表",
        finishedGlassShelfWithdrawReport:"料架入库报表",
    },
    components:{
        addNewSignature :'Add label name',
@@ -1258,7 +1260,8 @@
        role :'Role',
        userPassWord :'User Pass Word',
        glassPrice:'Glass Price',
        glassOptimize:'玻璃优化'
        glassOptimize:'玻璃优化',
        finishedGlassShelf:'成品料架'
    },

    glassPrice:{
@@ -1278,6 +1281,43 @@
        addProduce:'Select product',
        reorder:'reorder',
        unit:'元/m²'
    },

    finishedGlassShelf:{
        finishedGlassShelfInformation:'料架库存',
        finishedGlassShelfEmit:'料架出库',
        finishedGlassShelfWithdraw:'料架入库',
        createFinishedGlassShelf:'料架新增',
        msg:{
            errorNotNull1:'料架编号不能为空',
            errorNotNull2:'料架名称不能为空',
            errorNotNull3:'数量不能为空',
            errorNotNull4:'单价不能为空',
            errorNotNull5:'单位不能为空',
            errorNotNull6:'最大承重不能为空',
            errorNotNull7:'最大宽不能为空',
            errorNotNull8:'最大高不能为空',
            pleaseWithdrawTime:'请输入归还日期',
            error1:'已存在归还数据无法删除!',
            error2:'请选中一行数据!',
            error3:'已全部归还!',

        },
        glassShelfNumber:'料架编号',
        glassShelfName:'料架名称',
        availableQuantity:'现有数量',
        totalQuantity:'总数量',
        maxWidth:'最大宽',
        maxHeight:'最大高',
        maxWeight:'最大承重',
        withdrawQuantity:'归还数量',
        withdrawTime:'归还日期',
        operator:'经办人',
        withdraw:'归还',
        emitId:'出库编号',
        withdrawId:'入库编号',
        returnDelivery:'返回发货',
        withdrawQuantity1:'待归还数量',
    }



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

@@ -1217,6 +1217,8 @@
        materialReturnReport:"物料返库报表",
        optimizeOutboundReport:"优化出库报表",
        optimizeQuantity:"优化使用数量",
        finishedGlassShelfEmitReport:"料架出库报表",
        finishedGlassShelfWithdrawReport:"料架入库报表",
    },
    components:{
        addNewSignature :'라벨명 추가',
@@ -1267,7 +1269,8 @@
        role :'역할 권한',
        userPassWord :'비밀번호 변경',
        glassPrice:'유리 가격',
        glassOptimize:'유리 최적화'
        glassOptimize:'유리 최적화',
        finishedGlassShelf:'成品料架'
    },

    glassPrice:{
@@ -1287,6 +1290,43 @@
        addProduce:'제품 선택',
        reorder:'이월 주문',
        unit:'메타/m²'
    },

    finishedGlassShelf:{
        finishedGlassShelfInformation:'料架库存',
        finishedGlassShelfEmit:'料架出库',
        finishedGlassShelfWithdraw:'料架入库',
        createFinishedGlassShelf:'料架新增',
        msg:{
            errorNotNull1:'料架编号不能为空',
            errorNotNull2:'料架名称不能为空',
            errorNotNull3:'数量不能为空',
            errorNotNull4:'单价不能为空',
            errorNotNull5:'单位不能为空',
            errorNotNull6:'最大承重不能为空',
            errorNotNull7:'最大宽不能为空',
            errorNotNull8:'最大高不能为空',
            pleaseWithdrawTime:'请输入归还日期',
            error1:'已存在归还数据无法删除!',
            error2:'请选中一行数据!',
            error3:'已全部归还!',

        },
        glassShelfNumber:'料架编号',
        glassShelfName:'料架名称',
        availableQuantity:'现有数量',
        totalQuantity:'总数量',
        maxWidth:'最大宽',
        maxHeight:'最大高',
        maxWeight:'最大承重',
        withdrawQuantity:'归还数量',
        withdrawTime:'归还日期',
        operator:'经办人',
        withdraw:'归还',
        emitId:'出库编号',
        withdrawId:'入库编号',
        returnDelivery:'返回发货',
        withdrawQuantity1:'待归还数量',
    }



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

@@ -1206,6 +1206,8 @@
        materialReturnReport:"物料返库报表",
        optimizeOutboundReport:"优化出库报表",
        optimizeQuantity:"优化使用数量",
        finishedGlassShelfEmitReport:"料架出库报表",
        finishedGlassShelfWithdrawReport:"料架入库报表",
    },
    components:{
        addNewSignature :'Добавить имя метки',
@@ -1256,7 +1258,8 @@
        role :'Права на роль',
        userPassWord :'Изменить пароль',
        glassPrice:'Цена стекла.',
        glassOptimize:'玻璃优化'
        glassOptimize:'玻璃优化',
        finishedGlassShelf:'成品料架'
    },

    glassPrice:{
@@ -1276,6 +1279,43 @@
        addProduce:'选择产品',
        reorder:'转订单',
        unit:'元/m²'
    },

    finishedGlassShelf:{
        finishedGlassShelfInformation:'料架库存',
        finishedGlassShelfEmit:'料架出库',
        finishedGlassShelfWithdraw:'料架入库',
        createFinishedGlassShelf:'料架新增',
        msg:{
            errorNotNull1:'料架编号不能为空',
            errorNotNull2:'料架名称不能为空',
            errorNotNull3:'数量不能为空',
            errorNotNull4:'单价不能为空',
            errorNotNull5:'单位不能为空',
            errorNotNull6:'最大承重不能为空',
            errorNotNull7:'最大宽不能为空',
            errorNotNull8:'最大高不能为空',
            pleaseWithdrawTime:'请输入归还日期',
            error1:'已存在归还数据无法删除!',
            error2:'请选中一行数据!',
            error3:'已全部归还!',

        },
        glassShelfNumber:'料架编号',
        glassShelfName:'料架名称',
        availableQuantity:'现有数量',
        totalQuantity:'总数量',
        maxWidth:'最大宽',
        maxHeight:'最大高',
        maxWeight:'最大承重',
        withdrawQuantity:'归还数量',
        withdrawTime:'归还日期',
        operator:'经办人',
        withdraw:'归还',
        emitId:'出库编号',
        withdrawId:'入库编号',
        returnDelivery:'返回发货',
        withdrawQuantity1:'待归还数量',
    }



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

@@ -1225,6 +1225,8 @@
        materialReturnReport:"物料返库报表",
        optimizeOutboundReport:"优化出库报表",
        optimizeQuantity:"优化使用数量",
        finishedGlassShelfEmitReport:"料架出库报表",
        finishedGlassShelfWithdrawReport:"料架入库报表",
    },
    components:{
        addNewSignature :'新增标签名',
@@ -1275,7 +1277,8 @@
        role :'角色权限',
        userPassWord :'修改密码',
        glassPrice:'玻璃价格',
        glassOptimize:'玻璃优化'
        glassOptimize:'玻璃优化',
        finishedGlassShelf:'成品料架'
    },

    glassPrice:{
@@ -1295,6 +1298,43 @@
        addProduce:'选择产品',
        reorder:'转订单',
        unit:'元/m²'
    },

    finishedGlassShelf:{
        finishedGlassShelfInformation:'料架库存',
        finishedGlassShelfEmit:'料架出库',
        finishedGlassShelfWithdraw:'料架入库',
        createFinishedGlassShelf:'料架新增',
        msg:{
            errorNotNull1:'料架编号不能为空',
            errorNotNull2:'料架名称不能为空',
            errorNotNull3:'数量不能为空',
            errorNotNull4:'单价不能为空',
            errorNotNull5:'单位不能为空',
            errorNotNull6:'最大承重不能为空',
            errorNotNull7:'最大宽不能为空',
            errorNotNull8:'最大高不能为空',
            pleaseWithdrawTime:'请输入归还日期',
            error1:'已存在归还数据无法删除!',
            error2:'请选中一行数据!',
            error3:'已全部归还!',

        },
        glassShelfNumber:'料架编号',
        glassShelfName:'料架名称',
        availableQuantity:'现有数量',
        totalQuantity:'总数量',
        maxWidth:'最大宽',
        maxHeight:'最大高',
        maxWeight:'最大承重',
        withdrawQuantity:'归还数量',
        withdrawTime:'归还日期',
        operator:'经办人',
        withdraw:'归还',
        emitId:'出库编号',
        withdrawId:'入库编号',
        returnDelivery:'返回发货',
        withdrawQuantity1:'待归还数量',
    }



 north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelf.vue

@@ -52,35 +52,35 @@

const submitForm = () => {
  if(ruleForm.value.glassShelfNumber==null||ruleForm.value.glassShelfNumber==''){
    ElMessage.warning('料架编号不能为空')
    ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull1'))
    return
  }
  if(ruleForm.value.glassShelfName==null||ruleForm.value.glassShelfName==''){
    ElMessage.warning('料架名称不能为空')
    ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull2'))
    return
  }
  if(ruleForm.value.totalQuantity==null||ruleForm.value.totalQuantity==''){
    ElMessage.warning('数量不能为空')
    ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull3'))
    return
  }
  if(ruleForm.value.price==null||ruleForm.value.price==''){
    ElMessage.warning('单价不能为空')
    ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull4'))
    return
  }
  if(ruleForm.value.unit==null||ruleForm.value.unit==''){
    ElMessage.warning('单位不能为空')
    ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull5'))
    return
  }
  if(ruleForm.value.maxWeight==null||ruleForm.value.maxWeight==''){
    ElMessage.warning('最大承重不能为空')
    ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull6'))
    return
  }
  if(ruleForm.value.maxWidth==null||ruleForm.value.maxWidth==''){
    ElMessage.warning('最大宽不能为空')
    ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull7'))
    return
  }
  if(ruleForm.value.maxHeight==null||ruleForm.value.maxHeight==''){
    ElMessage.warning('最大高不能为空')
    ElMessage.warning(t('finishedGlassShelf.msg.errorNotNull8'))
    return
  }
  let filterData=ref({
@@ -132,50 +132,50 @@

     <el-row gutter="20" >
       <el-col :span="10" >
         料架编号：<el-input v-model.trim="ruleForm.glassShelfNumber"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
         {{$t('finishedGlassShelf.glassShelfNumber')}}：<el-input v-model.trim="ruleForm.glassShelfNumber"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
       </el-col>
       <el-col :span="10" >
         料架名称：<el-input  v-model.trim="ruleForm.glassShelfName" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
         {{$t('finishedGlassShelf.glassShelfNumber')}}：<el-input  v-model.trim="ruleForm.glassShelfName" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
       </el-col>
       <el-divider ></el-divider> <!-- 添加分隔线 -->
     </el-row>

     <el-row gutter="20" >
       <el-col :span="10" >
         现有数量：<el-input  v-model.trim="ruleForm.availableQuantity" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
         {{$t('finishedGlassShelf.availableQuantity')}}：<el-input  v-model.trim="ruleForm.availableQuantity" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
       </el-col>
       <el-col :span="10" >
         总数量：<el-input v-model.trim="ruleForm.totalQuantity"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
         {{$t('finishedGlassShelf.totalQuantity')}}：<el-input v-model.trim="ruleForm.totalQuantity"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
       </el-col>
       <el-divider ></el-divider> <!-- 添加分隔线 -->
     </el-row>

     <el-row gutter="20" >
       <el-col :span="10" >
         单价：<el-input v-model.trim="ruleForm.price"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
         {{$t('order.price')}}：<el-input v-model.trim="ruleForm.price"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
       </el-col>
       <el-col :span="10" >
         单位：<el-input v-model.trim="ruleForm.unit"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
         {{$t('ingredients.unit')}}单位：<el-input v-model.trim="ruleForm.unit"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
       </el-col>
       <el-divider ></el-divider> <!-- 添加分隔线 -->
     </el-row>

     <el-row gutter="20" >
       <el-col :span="10" >
         最大宽：<el-input v-model.trim="ruleForm.maxWidth"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
         {{$t('finishedGlassShelf.maxWidth')}}：<el-input v-model.trim="ruleForm.maxWidth"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
       </el-col>
       <el-col :span="10" >
         最大高：<el-input  v-model.trim="ruleForm.maxHeight" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
         {{$t('finishedGlassShelf.maxHeight')}}：<el-input  v-model.trim="ruleForm.maxHeight" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
       </el-col>
       <el-divider ></el-divider> <!-- 添加分隔线 -->
     </el-row>

     <el-row gutter="20" >
       <el-col :span="10" >
         最大承重：<el-input v-model.trim="ruleForm.maxWeight"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
         {{$t('finishedGlassShelf.maxWeight')}}：<el-input v-model.trim="ruleForm.maxWeight"  :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
       </el-col>
       <el-col :span="10" >
         备注：<el-input  v-model="ruleForm.remarks" :placeholder="$t('ingredients.pleaseEnterData')" style="width: 150px; height: 30px;" />
         {{$t('basicData.remarks')}}：<el-input  v-model="ruleForm.remarks" :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/finishedGlassShelf/CreateFinishedGlassShelfEmit.vue

@@ -202,16 +202,16 @@
  columns:[

    {type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left"},
    {field: 'glassShelfNumber',width:120,  title: t('料架编号'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'glassShelfName',width:120,  title: t('料架名称'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'quantity',width:120,  title: t('出库数量'),editRender: { name: 'input', attrs: { placeholder: '' } }},
    {field: 'availableQuantity',width:120,  title: t('现有数量'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'totalQuantity',width:120,  title: t('总数量'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'withdrawQuantity',width:120,  title: t('归还数量'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'price',width:120,  title: t('单价'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'money',width:120,  title: t('金额'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'unit',width:120,  title: t('单位'),editRender: { name: 'input' },filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'remarks',width:120,  title: t('备注'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'glassShelfNumber',width:120,  title: t('finishedGlassShelf.glassShelfNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'glassShelfName',width:120,  title: t('finishedGlassShelf.glassShelfName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'quantity',width:120,  title: t('ingredientsStock.outboundQuantity'),editRender: { name: 'input', attrs: { placeholder: '' } }},
    {field: 'availableQuantity',width:120,  title: t('finishedGlassShelf.availableQuantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'totalQuantity',width:120,  title: t('finishedGlassShelf.totalQuantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'withdrawQuantity',width:120,  title: t('finishedGlassShelf.withdrawQuantity'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'price',width:120,  title: t('order.price'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'money',width:120,  title: t('order.money'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'unit',width:120,  title: t('ingredients.unit'),editRender: { name: 'input' },filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'remarks',width:120,  title: t('basicData.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},

  ],//表头按钮
  toolbarConfig: {
@@ -264,17 +264,17 @@
          //表头数据校验
          const customerName = titleUploadData.value.customerName
          if(customerName === null || customerName === undefined || customerName === ''){
            ElMessage.error(t('客户名称不能为空'))
            ElMessage.error(t('customer.pleaseEnterTheCustomerName'))
            return
          }
          const project = titleUploadData.value.project
          if(project === null || project === undefined || project === ''){
            ElMessage.error(t('项目名称不能为空'))
            ElMessage.error(t('delivery.pleaseEnterTheAmountOfFunds'))
            return
          }
          const withdrawTime = titleUploadData.value.withdrawTime
          if(withdrawTime=== null || withdrawTime === undefined || withdrawTime === ''){
            ElMessage.error(t('归还日期不能为空'))
            ElMessage.error(t('finishedGlassShelf.msg.pleaseWithdrawTime'))
            return
          }

@@ -288,7 +288,7 @@
          })
          request.post("/finishedGlassShelf/insertFinishedGlassShelfEmit", flowData.value).then((res) => {
            if(res.code==200 && res.data==="true"){
              ElMessage.success(t('保存成功'))
              ElMessage.success(t('basicData.msg.saveSuccess'))
              //router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
              if(titleUploadData.value.emitId.trim()===""){
                router.push({path: '/main/finishedGlassShelf/finishedGlassShelfEmit', query:{random:Math.random()}})
@@ -393,13 +393,13 @@


        </el-col>
        <el-col  :span="2"><el-text>{{$t('经办人')}}:</el-text></el-col>
        <el-col  :span="2"><el-text>{{$t('finishedGlassShelf.operator')}}:</el-text></el-col>
        <el-col  :span="3"><el-input disabled v-model="titleUploadData.operator"/></el-col>

      </el-row>

      <el-row>
        <el-col  :span="2"><el-text>{{$t('归还日期')}}:</el-text></el-col>
        <el-col  :span="2"><el-text>{{$t('finishedGlassShelf.withdrawTime')}}:</el-text></el-col>
        <el-col  :span="3">
          <el-date-picker
              v-model="titleUploadData.withdrawTime"
@@ -408,7 +408,7 @@
              value-format="YYYY-MM-DD"
              :placeholder="$t('delivery.selectDate')"/>
        </el-col>
        <el-col  :span="2"><el-text>{{$t('备注')}}:</el-text></el-col>
        <el-col  :span="2"><el-text>{{$t('basicData.remarks')}}:</el-text></el-col>
        <el-col  :span="3"><el-input  v-model="titleUploadData.remarks"/></el-col>
      </el-row>


 north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/CreateFinishedGlassShelfWithdraw.vue

@@ -179,16 +179,16 @@
  },//表头参数
  columns:[
    {type: 'seq', title: t('basicData.Number'), width: 80 ,fixed:"left"},
    {field: 'emitId',width:120,  title: t('出库编号'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'emitNumber',width:120,  title: t('出库序号'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'glassShelfNumber',width:120,  title: t('料架编号'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'glassShelfName',width:120,  title: t('料架名称'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'quantity',width:120,  title: t('归还数量'),editRender: { name: 'input', attrs: { placeholder: '' } }},
    {field: 'quantity2',width:120,  title: t('待归还数量'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'price',width:120,  title: t('单价'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'money',width:120,  title: t('金额'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'unit',width:120,  title: t('单位'),editRender: { name: 'input' },filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'remarks',width:120,  title: t('备注'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'emitId',width:120,  title: t('finishedGlassShelf.emitId'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'emitNumber',width:120,  title: t('basicData.number'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'glassShelfNumber',width:120,  title: t('finishedGlassShelf.glassShelfNumber'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'glassShelfName',width:120,  title: t('finishedGlassShelf.glassShelfName'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'quantity',width:120,  title: t('finishedGlassShelf.withdrawQuantity'),editRender: { name: 'input', attrs: { placeholder: '' } }},
    {field: 'quantity2',width:120,  title: t('finishedGlassShelf.withdrawQuantity1'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'price',width:120,  title: t('order.price'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'money',width:120,  title: t('order.money'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},
    {field: 'unit',width:120,  title: t('ingredients.unit'),editRender: { name: 'input' },filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'remarks',width:120,  title: t('basicData.remarks'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true,filterMethod:filterChanged},

  ],//表头按钮
  toolbarConfig: {
@@ -318,9 +318,9 @@
        <el-col  :span="3">
          <el-input disabled v-model="titleUploadData.project"/>
        </el-col>
        <el-col  :span="2"><el-text>{{$t('经办人')}}:</el-text></el-col>
        <el-col  :span="2"><el-text>{{$t('finishedGlassShelf.operator')}}:</el-text></el-col>
        <el-col  :span="3"><el-input disabled v-model="titleUploadData.operator"/></el-col>
        <el-col  :span="2"><el-text>{{$t('备注')}}:</el-text></el-col>
        <el-col  :span="2"><el-text>{{$t('basicData.remarks')}}:</el-text></el-col>
        <el-col  :span="3"><el-input  v-model="titleUploadData.remarks"/></el-col>
      </el-row>


 north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelf.vue

@@ -26,10 +26,10 @@
  <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/finishedGlassShelf/finishedGlassShelfInformation' }">{{$t('料架库存')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/finishedGlassShelfEmit' }">{{$t('料架出库')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/finishedGlassShelfWithdraw' }">{{$t('料架入库')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/createFinishedGlassShelf' }">{{$t('料架新增')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/finishedGlassShelfInformation' }">{{$t('finishedGlassShelf.finishedGlassShelfInformation')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/finishedGlassShelfEmit' }">{{$t('finishedGlassShelf.finishedGlassShelfEmit')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/finishedGlassShelfWithdraw' }">{{$t('finishedGlassShelf.finishedGlassShelfWithdraw')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(4)" :class="indexFlag===4?'indexTag':''" :to="{ path: '/main/finishedGlassShelf/createFinishedGlassShelf' }">{{$t('finishedGlassShelf.createFinishedGlassShelf')}}</el-breadcrumb-item>
        <el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('ingredientsStock.returnToStorage')}}</el-breadcrumb-item>
      </el-breadcrumb>


 north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfEmit.vue

@@ -42,7 +42,7 @@
          ElMessage.success(t('basicData.msg.deleteSuccess'))
          router.push({path:'/main/finishedGlassShelf/finishedGlassShelfEmit',query:{random:Math.random()}})
        }else if(res.data==="false1"){
          ElMessage.warning(t('已存在归还数据无法删除！'))
          ElMessage.warning(t('finishedGlassShelf.msg.error1'))
        }else{
          ElMessage.warning(t('basicData.msg.deleteFail'))
        }
@@ -225,7 +225,7 @@
    body: {
      options: [
        [
          { code: 'sheet1', name: t('归还'), prefixIcon: 'vxe-icon-file-txt', visible: true}
          { code: 'sheet1', name: t('finishedGlassShelf.withdraw'), prefixIcon: 'vxe-icon-file-txt', visible: true}
        ]
      ]
    }
@@ -234,14 +234,14 @@
  columns:[
    {title: t('basicData.operate'), width: '110', slots: { default: 'button_slot' },fixed:'left'},
    { type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
    {field: 'state',title: t('归还'), width: 40,filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field: 'emitId', width:'150', title: t('出库单据编号'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
    {field: 'customerName', width: '150',title: t('客户名称'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'project', width: '120',title: t('项目名称'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operator',width: '100', title: t('经办人'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'withdrawTime',width: '100', title: t('归还日期'), sortable: true},
    {field: 'createTime',width: '100', title: t('创建时间'), sortable: true},
    {field: 'remarks',width: '100', title: t('备注'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'state',title: t('finishedGlassShelf.withdraw'), width: 40,filters:[{ data: '' }], slots: { default: 'state',filter: 'num2_filter' }},
    {field: 'emitId', width:'150', title: t('finishedGlassShelf.emitId'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
    {field: 'customerName', width: '150',title: t('order.customers'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'project', width: '120',title: t('order.project'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operator',width: '100', title: t('finishedGlassShelf.operator'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'withdrawTime',width: '100', title: t('finishedGlassShelf.withdrawTime'), sortable: true},
    {field: 'createTime',width: '100', title: t('basicData.creationTime'), sortable: true},
    {field: 'remarks',width: '100', title: t('basicData.remarks'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},

  ],//表头按钮
  toolbarConfig: {
@@ -333,7 +333,7 @@
            rowIndexData.value=selectRecords[0]
            sheetIndex.value=2
          }else{
            ElMessage.warning(t('请选中一行数据'))
            ElMessage.warning(t('finishedGlassShelf.msg.error2'))
            return
          }

@@ -348,7 +348,7 @@
            ElMessage.warning(t('productStock.unselectedData'))
            return
          }
          ElMessageBox.confirm("确认删除？",
          ElMessageBox.confirm(t('searchOrder.deleteConfirm'),
              {
                confirmButtonText: t('basicData.confirmButtonText'),
                cancelButtonText: t('basicData.cancelButtonText'),
@@ -409,7 +409,7 @@
            if(row.state<2){
              router.push({path: '/main/finishedGlassShelf/createFinishedGlassShelfWithdraw', query: { emitId: row.emitId }})
            }else{
              ElMessage.warning("已全部归还")
              ElMessage.warning(t('finishedGlassShelf.msg.error3'))
            }

          }

 north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfInformation.vue

@@ -155,24 +155,24 @@
    { type: 'checkbox',fixed:"left", title: t('basicData.check'), width: '80' },
    {title: t('basicData.operate'), width: '110', slots: { default: 'button_slot' },fixed:'left'},
    { type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
    {field: 'glassShelfNumber', width:'150', title: t('料架编号'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged },
    {field: 'glassShelfName', width: '150',title: t('料架名称'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'availableQuantity', width: '120',title: t('现有数量'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'totalQuantity',width: '100', title: t('总数量'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'price',width: '100', title: t('单价'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'money',width: '100', title: t('金额'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'unit', width: '100',title: t('单位'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'maxWeight', width: '100',title: t('最大承重'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'maxWidth',width: '100', title: t('最大高'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'maxHeight',width: '100', title: t('最大宽'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'remarks',width: '100', title: t('备注'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'createTime',width: '100', title: t('创建时间'), sortable: true},
    {field: 'glassShelfNumber', width:'150', title: t('finishedGlassShelf.glassShelfNumber'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged },
    {field: 'glassShelfName', width: '150',title: t('finishedGlassShelf.glassShelfName'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'availableQuantity', width: '120',title: t('finishedGlassShelf.availableQuantity'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'totalQuantity',width: '100', title: t('finishedGlassShelf.totalQuantity'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'price',width: '100', title: t('order.price'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'money',width: '100', title: t('order.money'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'unit', width: '100',title: t('ingredients.unit'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'maxWeight', width: '100',title: t('finishedGlassShelf.maxWeight'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'maxWidth',width: '100', title: t('finishedGlassShelf.maxWidth'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'maxHeight',width: '100', title: t('finishedGlassShelf.maxHeight'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'remarks',width: '100', title: t('basicData.remarks'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'createTime',width: '100', title: t('basicData.creationTime'), sortable: true},

  ],//表头按钮
  toolbarConfig: {
    buttons: [
      {'code': 'out', 'name': t('出库'),status: 'primary'},
      {'code': 'return', 'name': t('返回发货'),status: 'primary'}
      {'code': 'out', 'name': t('productStock.outbound'),status: 'primary'},
      {'code': 'return', 'name': t('finishedGlassShelf.returnDelivery'),status: 'primary'}
    ],
    /*import: false,
    export: true,

 north-glass-erp/northglass-erp/src/views/mm/finishedGlassShelf/FinishedGlassShelfWithdraw.vue

@@ -223,12 +223,12 @@
  columns:[
    {title: t('basicData.operate'), width: '110', slots: { default: 'button_slot' },fixed:'left'},
    { type: 'seq',fixed:"left", title: t('basicData.Number'), width: '80' },
    {field: 'withdrawId', width:'150', title: t('入库单据编号'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'customerName', width: '150',title: t('客户名称'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'project', width: '120',title: t('项目名称'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operator',width: '100', title: t('经办人'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'createTime',width: '100', title: t('创建时间'), sortable: true},
    {field: 'remarks',width: '100', title: t('备注'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'withdrawId', width:'150', title: t('finishedGlassShelf.withdrawId'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'customerName', width: '150',title: t('order.customers'), sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'project', width: '120',title: t('order.project'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'operator',width: '100', title: t('finishedGlassShelf.operator'), sortable: true,showOverflow:"ellipsis",filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'createTime',width: '100', title: t('basicData.creationTime'), sortable: true},
    {field: 'remarks',width: '100', title: t('basicData.remarks'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},

  ],//表头按钮
  toolbarConfig: {
@@ -309,7 +309,7 @@
            rowIndexData.value=selectRecords[0]
            sheetIndex.value=2
          }else{
            ElMessage.warning(t('请选中一行数据'))
            ElMessage.warning(t('finishedGlassShelf.msg.error2'))
            return
          }

@@ -324,7 +324,7 @@
            ElMessage.warning(t('productStock.unselectedData'))
            return
          }
          ElMessageBox.confirm("确认删除？",
          ElMessageBox.confirm(t('searchOrder.deleteConfirm'),
              {
                confirmButtonText: t('basicData.confirmButtonText'),
                cancelButtonText: t('basicData.cancelButtonText'),

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

@@ -85,8 +85,8 @@
            </span>
              <template #dropdown>
                <el-dropdown-menu>
                  <el-dropdown-item command="/main/stockReport/finishedGlassShelfEmitReport" >{{$t('料架出库')}}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/finishedGlassShelfWithdrawReport" >{{ $t('料架入库') }}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/finishedGlassShelfEmitReport" >{{$t('stockReport.finishedGlassShelfEmitReport')}}</el-dropdown-item>
                  <el-dropdown-item command="/main/stockReport/finishedGlassShelfWithdrawReport" >{{ $t('stockReport.finishedGlassShelfWithdrawReport') }}</el-dropdown-item>
                </el-dropdown-menu>
              </template>
            </el-dropdown>