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

王震

2023-12-27 b1dbfd44f6bafaa4d24e0c1c3a0f7ae548e77f60

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

@@ -7,11 +7,11 @@
        <h2 v-if="!editable">查看-工艺文件</h2>
      </div>
      <div class="btn-group header-right" v-if="editable">
        <el-button @click="save()">保存</el-button>
        <el-button type="primary" @click="save()">保存</el-button>
      </div>
    </div>
    <div class="page-main">
      <div class="document-basic">
      <div class="document-basic" style="height: 28%;">
        <el-form
          :model="dataForm"
          :rules="dataRule"
@@ -102,7 +102,7 @@
            </el-col> -->
            <el-col :span="6">
              <el-form-item label="产品零件号" prop="partNo">
                <el-input v-model="dataForm.partNo" placeholder="请选择零件">
                <el-input disabled v-model="dataForm.partNo" placeholder="请选择零件">
                  <el-button
                    slot="append"
                    icon="el-icon-search"
@@ -113,7 +113,9 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="产品零件描述" prop="partName">
                <el-tooltip class="item" effect="dark" :content="dataForm.partName" >
                <el-input v-model="dataForm.partName" disabled> </el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
          </el-row>
@@ -160,6 +162,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
@@ -250,7 +261,8 @@
          >
            <TeststandardDialog
              :editable="editable"
              :documentId="Number(dataForm.id)"
              :key="dataForm.id"
              :documentId="dataForm.id"
            >
            </TeststandardDialog>
          </el-tab-pane>
@@ -523,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"
@@ -542,7 +554,7 @@
                                  refreshTestStandardInfo
                                "
                              ></checkStandardTable>
                            </el-tab-pane>
                            </el-tab-pane> -->
                            <!-- <el-tab-pane label="抽检规则">
                              <div>
                                <div style="padding: 0px 20px;">
@@ -854,7 +866,7 @@
          { required: true, message: '版本号不能为空', trigger: 'blur' }
        ],
        projectNo: [
          { required: true, message: '项目号不能为空', trigger: 'blur' }
          // { required: true, message: '项目号不能为空', trigger: 'blur' }
        ],
        projectType: [
          { required: true, message: '项目类别不能为空', trigger: 'change' }