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

zouyu

2023-12-13 74c2ee57f01f17cf61f69440b8981321452377b2

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

 src/views/common/document.vue

@@ -151,7 +151,7 @@
            searchInfoType: 'text'
          },
          // 绝缘颜色
          {
          /* {
            minWidth: '120',
            prop: 'insulationColor',
            label: '绝缘颜色',
@@ -169,7 +169,7 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          }, */
          {
            minWidth: '120',
            prop: 'version',
@@ -189,7 +189,7 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
         /*  {
            minWidth: '120',
            prop: 'country',
            label: '国家',
@@ -197,7 +197,7 @@
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text'
          },
          }, */
          {
            minWidth: '120',
            prop: 'state',

 src/views/common/teststandardradio.vue

@@ -44,7 +44,7 @@
            align="center"
            width="50"
          />
          <el-table-column label="线芯" prop="wireCore" align="center" />
          <!-- <el-table-column label="线芯" prop="wireCore" align="center" /> -->
          <el-table-column label="参数编号" prop="code" align="center" />
          <el-table-column label="参数项" prop="parameterItem" align="center" />
          <el-table-column
@@ -57,8 +57,8 @@
            prop="parameterFormat"
            align="center"
          />
          <el-table-column label="通道" prop="aisle" align="center" />
          <el-table-column label="部位" prop="position" align="center" />
          <!-- <el-table-column label="通道" prop="aisle" align="center" />
          <el-table-column label="部位" prop="position" align="center" /> -->
          <el-table-column label="单位" prop="unit" align="center" />
        </el-table>
      </el-col>

 src/views/plan/manufacturingorder/auto-operationtask.vue

@@ -74,7 +74,7 @@
          </el-select>
        </template>
      </el-table-column>
      <el-table-column prop="locationId" label="库位" align="center">
     <!--  <el-table-column prop="locationId" label="库位" align="center">
        <template slot-scope="scope">
          <el-select
            v-model="scope.row.locationId"
@@ -92,7 +92,7 @@
            </el-option>
          </el-select>
        </template>
      </el-table-column>
      </el-table-column> -->
      <el-table-column
        prop="partNo"
        label="零件号"
@@ -124,7 +124,7 @@
      </el-table-column>
      <el-table-column prop="sunit" label="单位2" align="center">
      </el-table-column> -->
      <el-table-column prop="reelSpec" label="载具规格" align="center">
     <!--  <el-table-column prop="reelSpec" label="载具规格" align="center">
        <template slot-scope="scope">
          <el-input v-model="scope.row.reelSpec"></el-input>
        </template>
@@ -133,7 +133,7 @@
        <template slot-scope="scope">
          <el-input v-model="scope.row.discNum"></el-input>
        </template>
      </el-table-column>
      </el-table-column> -->
      <el-table-column prop="remark" label="备注" align="center">
        <template slot-scope="scope">
          <el-input v-model="scope.row.remark"></el-input>

 src/views/plan/masterproductionschedule/index.vue

@@ -411,7 +411,7 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
          /* {
            minWidth: '140',
            prop: 'inventoryReservedQuantity',
            label: '库存预留数量',
@@ -419,7 +419,7 @@
            isTrue: true,
            isSearch: false,
            searchInfoType: 'text'
          },
          }, */
          /* {
            minWidth: '140',
            prop: 'outsourcingNumber',

 src/views/technology/document/checkStandardTable.vue

@@ -104,13 +104,13 @@
              align="center"
              width="50"
            />
            <el-table-column label="线芯" prop="wireCore" align="center" />
            <el-table-column
           <!--  <el-table-column label="线芯" prop="wireCore" align="center" /> -->
           <!--  <el-table-column
              prop="isCheck"
              label="抽检"
              align="center"
              :formatter="isCheckFormatter"
            />
            /> -->
            <el-table-column label="参数编号" prop="code" align="center" />
            <el-table-column
              label="参数项"
@@ -162,12 +162,12 @@
              align="center"
            >
            </el-table-column>
            <el-table-column label="通道" prop="aisle" align="center">
            <!-- <el-table-column label="通道" prop="aisle" align="center">
            </el-table-column>
            <el-table-column label="部位" prop="position" align="center">
            </el-table-column>
            </el-table-column> -->
            <el-table-column label="单位" prop="unit" align="center" />
            <el-table-column
           <!--  <el-table-column
              width="150"
              label="继承检测零件"
              prop="extendsPartNo"
@@ -196,9 +196,9 @@
                  ></el-button>
                </el-input>
              </template>
            </el-table-column>
            </el-table-column> -->

            <el-table-column
            <!-- <el-table-column
              width="150"
              label="继承检测工序"
              prop="extendsPartNo"
@@ -257,7 +257,7 @@
                  ></el-button>
                </el-input>
              </template>
            </el-table-column>
            </el-table-column> -->
            <el-table-column label="操作" align="center">
              <template slot-scope="scope">
                <el-button

 src/views/technology/document/index.vue

@@ -239,7 +239,7 @@
            isSearch: true,
            searchInfoType: 'text'
          },
          {
          /* {
            minWidth: '120',
            prop: 'projectType',
            label: '项目类别',
@@ -271,7 +271,7 @@
            isSearch: true,
            searchInfoType: 'text'
          },

 */
          // 描述
          {
            minWidth: '120',

 src/views/technology/document/teststandard.vue

@@ -187,6 +187,10 @@
  created() {
    getTestStand(this.paramObj)
  },
  mounted(){
    console.log(11111);
    getTestStand(this.paramObj)
  },
  methods: {
    // 获取数据列表
    getData() {