合并冲突

licp

2024-05-28 52e18000ace434b2acdebce5e118c45c337a3fe7

 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"
@@ -24,10 +24,12 @@
          <el-row>
            <el-col :span="6">
              <el-form-item prop="name" label="文件名称">
                <el-tooltip class="item" effect="dark" :content="dataForm.name" >
                <el-input
                  v-model="dataForm.name"
                  placeholder="文件名称"
                ></el-input>
                </el-tooltip>
              </el-form-item>
            </el-col>
            <el-col :span="6">
@@ -102,7 +104,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 +115,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>
@@ -128,10 +132,10 @@
              </el-col>
              <el-col :span="6">
                <el-form-item label="BOM" prop="bomId">
                  <el-select 
                    :disabled="dataForm.id != null" 
                    v-model="dataForm.bomId" 
                    placeholder="" 
                  <el-select
                    :disabled="dataForm.id != null"
                    v-model="dataForm.bomId"
                    placeholder=""
                    style="width: 100%;"
                    filterable>
                    <el-option
@@ -145,10 +149,10 @@
              </el-col>
              <el-col :span="6">
                <el-form-item label="工艺路线编号" prop="routingList">
                  <el-select 
                    :disabled="dataForm.id != null" 
                    v-model="dataForm.routingId" 
                    placeholder="" 
                  <el-select
                    :disabled="dataForm.id != null"
                    v-model="dataForm.routingId"
                    placeholder=""
                    style="width: 100%;"
                    filterable>
                    <el-option
@@ -160,6 +164,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 +263,8 @@
          >
            <TeststandardDialog
              :editable="editable"
              :documentId="Number(dataForm.id)"
              :key="dataForm.id"
              :documentId="dataForm.id"
            >
            </TeststandardDialog>
          </el-tab-pane>
@@ -421,7 +435,7 @@
                      工序参数
                    </div>
                  </div>
 

                 <!-- <div class="document-bom-div" v-show="item.showBom">
                    <el-tooltip
                      class="item"
@@ -523,7 +537,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 +556,7 @@
                                  refreshTestStandardInfo
                                "
                              ></checkStandardTable>
                            </el-tab-pane>
                            </el-tab-pane> -->
                            <!-- <el-tab-pane label="抽检规则">
                              <div>
                                <div style="padding: 0px 20px;">
@@ -773,14 +787,15 @@
  saveLctJson,
  getLctJson,
  routingChildCheck,
  qryDocSamplingRule
  qryDocSamplingRule,
  getTestStandardParams
} from '@/api/technology/document'
import { delDocumentSamplingRule } from '@/api/quality/documentsamplingrule'
import { getObj as getTechnologyDetail } from '@/api/technology/routing'
import { getObj as getStructureDetail } from '@/api/technology/completeproductstructure'
import { fetchList as getBomList } from '@/api/technology/completeproductstructure'
import { getRouting } from '@/api/technology/document'
import { getTestStandardParams } from '@/api/quality/teststandard'
//import { getTestStandardParams } from '@/api/quality/teststandard'
import { remote } from '@/api/admin/dict'
import { fetchList as getStandard } from '@/api/quality/standardbind'
import { getStore } from '@/util/store.js'
@@ -854,7 +869,7 @@
          { required: true, message: '版本号不能为空', trigger: 'blur' }
        ],
        projectNo: [
          { required: true, message: '项目号不能为空', trigger: 'blur' }
          // { required: true, message: '项目号不能为空', trigger: 'blur' }
        ],
        projectType: [
          { required: true, message: '项目类别不能为空', trigger: 'change' }
@@ -974,7 +989,6 @@
            bomId: this.dataForm.bomId,
          })
        ).then((response) => {
          console.log(response)
          this.routingList = response.data.data
        })
      } else {
@@ -1206,7 +1220,6 @@
        if (this.currTechnologyName != null && this.currTechnologyName !== '') {
          // 当用户删除工艺文件中关联的工艺路线时，若该文件对应BOM中所需半成品的工艺路线也已与当前工艺文件关联
          routingChildCheck(this.currTechnologyBomPartName).then((res) => {
            console.log('res', res.data)
            const resData = res.data
            let num = 0
            if (resData.code === 0) {
@@ -1850,7 +1863,6 @@
        allKeyValues = allKeyValues.concat(keyValues)
        i = i + keyValues.length
      }
      console.log("aaa--",allKeyValues)
      this.materialCostList = allKeyValues
    },
    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
@@ -1904,7 +1916,6 @@
      if (this.dataForm.id) {
        this.getDocumentInfo(this.dataForm.id)
      }
      console.log('上传成功')
    },
    handleStructureExceed(files, fileList) {
      // this.$message.warning(
@@ -1946,7 +1957,6 @@
      this.dialogFlowVisible = true
    },
    handleFlowSuccess(response, file, fileList) {
      console.log('上传成功')
    },
    handleFlowExceed(files, fileList) {
      this.$message.warning(
@@ -1990,8 +2000,6 @@
    },
    getSummaries(param) {
      const { columns, data } = param
      // console.log(columns, 'A')
      // console.log(data, 'B')
      const sums = []
      columns.forEach((column, index) => {
        if (index === 0) {