guoyuji
2024-12-19 04b7178fb590cf248d7502ee9d98651012a36e5a
提交基础数据复合工序与普通工序的区别
6个文件已修改
16 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/ar.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/en.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/ru.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/lang/zh.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -253,7 +253,7 @@
          <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px  "/></div>
          <div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
          <div>{{ company.companyName }}</div>
          <div>生产流程卡<span v-if="printProject!=null">({{ printProject }})</span></div>
          <div>生产流程卡<span style="font-weight: bold" v-if="printProject!=null">({{ printProject }})</span></div>
          <div  style="font-weight: bolder;display: flex;justify-content:space-between">
            <div>
              打印人:{{user.user.userName}} &nbsp;&nbsp;
north-glass-erp/northglass-erp/src/lang/ar.js
@@ -873,6 +873,8 @@
        msg2:'لا يمكن تحميل الصور  إلا بتنسيق JPG أو PNG',
        selectFile:'حدد الملف',
        msg3:'يمكن تحميل ملفات jpg/png فقط ويجب ألا يتجاوز حجمها 5 ميغابايت',
        commonProcess:'普通工序',
        laminatingProcess:'合片工序',
    },
    machine:{
        page:{
north-glass-erp/northglass-erp/src/lang/en.js
@@ -873,6 +873,8 @@
        msg2:'Upload picture can only be JPG or PNG format!',
        selectFile:'Selecting file',
        msg3:'Only jpg/png files can be uploaded and the size does not exceed 5 MB',
        commonProcess:'普通工序',
        laminatingProcess:'合片工序',
    },
    machine:{
        page:{
north-glass-erp/northglass-erp/src/lang/ru.js
@@ -873,6 +873,8 @@
        msg2:'上传头像图片只能是 JPG或者PNG 格式!',
        selectFile:'选取文件',
        msg3:'只能上传jpg/png文件,且不超过5m',
        commonProcess:'普通工序',
        laminatingProcess:'合片工序',
    },
    machine:{
        page:{
north-glass-erp/northglass-erp/src/lang/zh.js
@@ -873,6 +873,8 @@
        msg2:'上传图片只能是 JPG或者PNG 格式!',
        selectFile:'选取文件',
        msg3:'只能上传jpg/png文件,且不超过5m',
        commonProcess:'普通工序',
        laminatingProcess:'合片工序',
    },
    machine:{
        page:{
north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue
@@ -222,7 +222,11 @@
    <el-row>
      <el-col :span="4">{{ $t('orderBasicData.alias') }}:</el-col>
      <el-col :span="12">
        <el-input v-model="basic.nickname"/>
        <el-input v-if="basic.basicType.length>0 && basic.basicType[1]!=='process'" v-model="basic.nickname"/>
        <el-select v-model="basic.nickname" v-else>
          <el-option  :label="$t('orderBasicData.commonProcess')" value="" />
          <el-option  :label="$t('orderBasicData.laminatingProcess')" value="laminating" />
        </el-select>
      </el-col>
    </el-row>
    <el-row v-if="basic.basicType.length!==0 && basic.basicType[1]==='icon'" >