Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

zouyu

2023-12-12 fc803522c643740f0a1907bcb74b26b1d50d5099

Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

 src/views/common/part.vue

@@ -202,24 +202,24 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '100',
            prop: 'drawingNumber',
            label: '图号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          {
            minWidth: '120',
            prop: 'ean',
            label: 'EAN编码',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          }
          // {
          //   minWidth: '100',
          //   prop: 'drawingNumber',
          //   label: '图号',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // {
          //   minWidth: '120',
          //   prop: 'ean',
          //   label: 'EAN编码',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // }
        ],
        materialTypeList: [],
        materialAttributeList: []

 src/views/technology/completeproductstructure/index.vue

@@ -34,7 +34,7 @@
      multipleSelection: [],
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: 'mes/bom/uploadExcel',
      },
      prelang: 'completeProductStructure',

 src/views/technology/document/document-form.vue

@@ -11,7 +11,7 @@
      </div>
    </div>
    <div class="page-main">
      <div class="document-basic">
      <div class="document-basic" style="height: 28%;">
        <el-form
          :model="dataForm"
          :rules="dataRule"
@@ -160,6 +160,15 @@
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :span="6">
              <el-form-item label="项目号" prop="projectNo">
                <el-input
                  v-model="dataForm.projectNo"
                  placeholder="项目号"
                  style="width:100%"
                ></el-input>
              </el-form-item>
            </el-col> 
              <el-col :span="6">
                <el-form-item label="备注" prop="remark">
                  <el-input
@@ -854,7 +863,7 @@
          { required: true, message: '版本号不能为空', trigger: 'blur' }
        ],
        projectNo: [
          { required: true, message: '项目号不能为空', trigger: 'blur' }
          // { required: true, message: '项目号不能为空', trigger: 'blur' }
        ],
        projectType: [
          { required: true, message: '项目类别不能为空', trigger: 'change' }

 src/views/technology/routing/index.vue

@@ -138,7 +138,7 @@
      customUpload: true,
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: '/mes/routing/uploadExcel'
      },
      prelang: 'routing',

 src/views/technology/structure/index.vue

@@ -129,7 +129,7 @@
      customUpload: true,
      uploadInfo: {
        // 是否展示上传EXCEL以及对应的url
        isShow: true,
        isShow: false,
        url: '/mes/structure/uploadExt'
      },
      prelang: 'structure',