Merge remote-tracking branch 'origin/master'

王震

2023-12-13 67da82f0b0c24df5f19bbfcfec63801d9ae902d8

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

@@ -1,5 +1,5 @@
<template>
  <div>
  <div style="height: 100%">
    <div class="page-header">
      <div class="header-left">
        <a @click="$router.go(-1)"><i class="icon-btn-back"></i></a>
@@ -25,7 +25,7 @@
          <el-row>
            <el-col :span="24">
              <el-form-item label="BOM编号">
                <el-input v-model="treeForm.number" placeholder="BOM编号">
                <el-input v-model="treeForm.number" disabled placeholder="BOM编号">
                </el-input>
              </el-form-item>

@@ -75,32 +75,26 @@
                </el-input>
              </el-form-item>

              <el-form-item label="替代号" prop="alternativeNo">
              <!-- <el-form-item label="替代号" prop="alternativeNo">
                <el-input
                  v-model="treeForm.alternativeNo"
                  placeholder="替代号"
                  disabled
                >
                </el-input>
              </el-form-item>
              </el-form-item> -->

              <el-form-item label="替代描述" prop="alternativeDesc">
              <!-- <el-form-item label="替代描述" prop="alternativeDesc">
                <el-input
                  v-model="treeForm.alternativeDesc"
                  placeholder="替代描述"
                  disabled
                >
                </el-input>
              </el-form-item>
              </el-form-item> -->

              <el-form-item label="绝缘颜色">
                <el-input
                  v-model="treeForm.insulationColor"
                  placeholder="绝缘颜色"
                >
                </el-input>
              </el-form-item>
              <el-form-item label="护套颜色">
              <!--   -->
              <!-- <el-form-item label="护套颜色">
                <el-input v-model="treeForm.sheathColor" placeholder="护套颜色">
                </el-input>
              </el-form-item>
@@ -110,7 +104,7 @@
                  placeholder="特性1"
                >
                </el-input>
              </el-form-item>
              </el-form-item> -->
            </el-col>
          </el-row>
        </el-form>
@@ -125,7 +119,7 @@
            style="width: 100%;"
            row-key="id"
            border
            height="580"
            height="720"
            default-expand-all
            @expand-change="expandChange"
            :row-class-name="tableRowClassName"
@@ -134,6 +128,7 @@
            <el-table-column label="零件名称" prop="partName"></el-table-column>
            <el-table-column label="单位" prop="unit"></el-table-column>
            <el-table-column label="数量" prop="qpa"></el-table-column>
            <!-- <el-table-column label="盘数" prop="discNum"></el-table-column> -->
          </el-table>
          <!-- <el-table
            class="tree-select-table"
@@ -238,7 +233,8 @@
  getPartAllStructureExt,
  addObj,
  getObj,
  putObj
  putObj,
  updateObj
} from '@/api/technology/completeproductstructure'
import { remote } from '@/api/admin/dict'
import productStructureDialog from '@/views/common/productstructure.vue'
@@ -298,7 +294,6 @@
  },
  computed: {
    editable: function() {
      console.log()
      if (!this.dataForm.id) {
        return true
      }
@@ -339,27 +334,11 @@
      if (this.dataForm.id) {
        getObj(this.dataForm.id).then((response) => {
          var resultData = response.data.data
          this.treeForm.partId = resultData.partId
          this.treeForm.partNo = resultData.partNo
          this.treeForm.partName = resultData.partName
          this.treeForm.number = resultData.number
          this.treeForm.insulationColor = resultData.insulationColor
          this.treeForm.sheathColor = resultData.sheathColor
          this.treeForm.characteristicOne = resultData.characteristicOne
          this.treeForm.version = resultData.version
          this.treeForm.alternativeNo = resultData.alternativeNo
          this.treeForm.alternativeDesc = resultData.alternativeDesc
          this.treeForm.bomTypeDb = resultData.bomTypeDb
          this.treeForm = resultData
          this.dataForm.state = resultData.state
          this.preViewData = []
          this.preViewData.push(resultData.tree)
          this.tableData = resultData.bomComponentVOS
          // getPartAllStructureExt(this.treeForm).then((res) => {
          //   const result = res.data
          //   if (result.code === 0) {
          //     this.tableData.push(result.data)
          //   }
          // })
        })
      } else {
        this.initDefaultForm()
@@ -412,7 +391,15 @@
      }
    },
    dataFormSubmit() {
      console.log(this.treeForm)
      let data = this.treeForm
      if(data.id != null){
        updateObj(data).then(res=>{
          this.$message.success("保存成功")

        }).catch(error=>{
          this.$message.error("保存失败")
        })
      }
      // const mapTree = (org) => {
      //   const haveChildren =
      //     Array.isArray(org.children) && org.children.length > 0
@@ -1008,7 +995,7 @@
.completeProductStructure-design {
  float: left;
  width: 100%;
  height: 650px;
  height: 800px;
  padding: 10px 20px;
  border: 1px solid #ddd;
  background-color: #fff;