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

zouyu

2023-12-27 0a5bc054639610f7ccaf8e0a2f87136268c66abf

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

 src/views/basic/param/param-form.vue

@@ -13,7 +13,7 @@
      class="l-mes"
    >
      <el-form-item label="参数编号" prop="code">
        <el-input v-model="dataForm.code" placeholder="参数编号"></el-input>
        <el-input v-model="dataForm.code" placeholder="参数编号" disabled></el-input>
      </el-form-item>
      <el-form-item label="参数项" prop="parameterItem">
        <el-input
@@ -99,9 +99,6 @@
        dict: ''
      },
      dataRule: {
        code: [
          { required: true, message: '参数编号不能为空', trigger: 'blur' }
        ],
        parameterItem: [
          { required: true, message: '参数项不能为空', trigger: 'blur' }
        ],

 src/views/plan/manufacturingorder/index.vue

@@ -451,6 +451,16 @@
        // 标题
        column: [
          {
            minWidth: '120',
            prop: 'moNo',
            label: '车间订单号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text',
            render: { fun: this.addOrUpdateHandle }
          },
          {
            minWidth: '140',
            prop: 'state',
            label: '状态',
@@ -591,16 +601,7 @@
              return this.bomTypeDbOptions
            }
          },
          {
            minWidth: '120',
            prop: 'moNo',
            label: '车间订单号',
            sort: true,
            isTrue: true,
            isSearch: true,
            searchInfoType: 'text',
            render: { fun: this.addOrUpdateHandle }
          },
          
          {
            minWidth: '120',
            prop: 'manufactureAttr',

 src/views/plan/manufacturingorder/productorder-form.vue

@@ -478,7 +478,7 @@
                          </el-table>
                        </el-card>
                      </el-tab-pane>
                      <el-tab-pane
                     <!--  <el-tab-pane
                        label="检测标准"
                        key="tb1"
                        id="tb1"
@@ -491,7 +491,7 @@
                          :moRoutingOperationId="moRoutingOperationId"
                          @refreshTestStandardInfo="refreshTestStandardInfo"
                        ></testStandardTable>
                      </el-tab-pane>
                      </el-tab-pane> -->
                      <!-- <el-tab-pane
                        label="抽检规则"
                        key="tb2"

 src/views/product/workbench/productrecord-tab.vue

@@ -120,12 +120,12 @@
                  :show-overflow-tooltip="true"
                >
                  <template slot="header" slot-scope="scope">
                    <div style="line-height: 14px;">SN号</div>
                    <div style="line-height: 14px;">批次号</div>
                    <div class="th" @click.stop>
                      <template>
                        <el-input
                          type="text"
                          placeholder="SN号"
                          placeholder="批次号"
                          v-model="searchContent.outBatchNo"
                          clearable
                          size="mini"
@@ -280,7 +280,7 @@
                </el-table-column>
              </el-table>
            </el-tab-pane>
            <el-tab-pane label="附件">
            <!-- <el-tab-pane label="附件">
              <el-upload
                ref="upload"
                action="/mes/operationTask/upload"
@@ -292,7 +292,7 @@
                :auto-upload="false"
                list-type="picture"
              ></el-upload>
            </el-tab-pane>
            </el-tab-pane> -->
          </el-tabs>
        </div>
      </div>

 src/views/quality/teststandard/index.vue

@@ -192,16 +192,6 @@
                </template>
              </el-table-column><el-table-column
                label="测试方法"
                prop="purpose"
                align="center"
                width="80"
              >
                <template slot-scope="scope">
                  <el-input v-model="scope.row.purpose"></el-input>
                </template>
              </el-table-column>
              <el-table-column
                label="测试目的"
                prop="method"
                align="center"
                width="80"
@@ -210,6 +200,16 @@
                  <el-input v-model="scope.row.method"></el-input>
                </template>
              </el-table-column>
              <el-table-column
                label="测试目的"
                prop="purpose"
                align="center"
                width="80"
              >
                <template slot-scope="scope">
                  <el-input v-model="scope.row.purpose"></el-input>
                </template>
              </el-table-column>

              <!-- <el-table-column
                label="通道"

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

@@ -535,7 +535,7 @@
                                :richContent="ele.remark"
                              ></rich-text>
                            </el-tab-pane> -->
                            <el-tab-pane label="检测标准">
                            <!-- <el-tab-pane label="检测标准">
                              <checkStandardTable
                                ref="documentTestStandardTable"
                                :dataFormId="dataForm.id"
@@ -554,7 +554,7 @@
                                  refreshTestStandardInfo
                                "
                              ></checkStandardTable>
                            </el-tab-pane>
                            </el-tab-pane> -->
                            <!-- <el-tab-pane label="抽检规则">
                              <div>
                                <div style="padding: 0px 20px;">

 src/views/technology/document/teststandard.vue

@@ -42,6 +42,7 @@
            align="center"
          />
          <el-table-column label="单位" prop="unit" align="center" />
          <el-table-column label="测试方法" prop="method" align="center" />
        </el-table>
      </el-col>
    </el-row>