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

zouyu

2023-11-04 5cdff5e062935666b06848a3b63ae9b32d114146

 src/views/technology/structure/index.vue

@@ -47,7 +47,7 @@
                multiple
              >
                <i class="el-icon-upload"></i>
                <div class="el-upload__text"><em>导入装备数据</em></div>
                <div class="el-upload__text"><em>导入产品结构数据</em></div>
                <div class="el-upload__tip" slot="tip">
                  只能上传xlsx/xls文件，且不超过10M<el-button
                    type="text"
@@ -58,7 +58,7 @@
                </div>
              </el-upload>
            </div>
            <div>
            <!-- <div>
              <el-upload
                style="margin-left:8px;display: inline;"
                class="upload-demo"
@@ -88,7 +88,7 @@
                  >
                </div>
              </el-upload>
            </div>
            </div> -->
          </div>
        </span>
      </el-dialog>
@@ -132,7 +132,7 @@
        isShow: true,
        url: '/mes/structure/uploadExt'
      },
      prelang: 'structure',
      prelang: 'operation',
      options: {
        height: 300, // 默认高度-为了表头固定
        stripe: true, // 是否为斑马纹 table
@@ -198,42 +198,42 @@
              return this.bomTypeDbOptions
            }
          },
          // 替代
          {
            minWidth: '120',
            prop: 'alternativeNo',
            label: '替代',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // 替代描述
          {
            minWidth: '120',
            prop: 'alternativeDesc',
            label: '替代描述',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          // // 替代
          // {
          //   minWidth: '120',
          //   prop: 'alternativeNo',
          //   label: '替代',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // // 替代描述
          // {
          //   minWidth: '120',
          //   prop: 'alternativeDesc',
          //   label: '替代描述',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'text'
          // },
          // 是否已同步至ERP
          {
            minWidth: '120',
            prop: 'ifsSync',
            label: '已同步至ERP',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'select',
            optList: () => {
              return this.getIfsSyncOptionList()
            },
            formatter: (row, column, cellValue) => {
              return cellValue == true ? '是' : '否'
            }
          },
          // {
          //   minWidth: '120',
          //   prop: 'ifsSync',
          //   label: '已同步至ERP',
          //   sort: true,
          //   isTrue: true,
          //   isSearch: true,
          //   searchInfoType: 'select',
          //   optList: () => {
          //     return this.getIfsSyncOptionList()
          //   },
          //   formatter: (row, column, cellValue) => {
          //     return cellValue == true ? '是' : '否'
          //   }
          // },
          // 是否为默认结构
          {
            minWidth: '120',