Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

Fixiaobai

2023-09-15 ff54cb77e4fe63d5c85669cc3bd116d015c17c2d

Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

 src/components/view/record-content.vue

@@ -140,12 +140,13 @@
            </span>
        </el-dialog>
        <!-- 新增弹窗 -->
        <el-dialog title="生产记录新增" :visible.sync="dialogVisible" ref="ruleForm" width="35%">
        <el-dialog title="生产记录新增" :visible.sync="dialogVisible" :rules="Rules"
        ref="ruleForm" width="35%">
            <div>
                <el-form ref="form" :model="form" label-width="80px">
                <el-form-item label="类型">
                    <template>
                        <el-select v-model="form.type"  :rules="Rules"
                        <el-select v-model="form.type"  
                        @change="edittype" placeholder="请选择" style="width: 480px;">
                            <el-option label="橡胶连接器" :value="0"></el-option>
                            <el-option label="金属连接器" :value="1"></el-option>

 src/components/view/technology.vue

@@ -280,7 +280,11 @@
            >元件:</el-col
          >
          <el-col :span="16" :offset="1">
            <el-select
            <el-input v-model="cell"
             placeholder="请输入元件名称"
             style="width: 200px">
            </el-input>
            <!-- <el-select
              v-model="cell"
              style="width: 310px"
              disabled
@@ -294,7 +298,7 @@
                :value="item.id"
              >
              </el-option>
            </el-select>
            </el-select> -->
          </el-col>
        </el-row>
        <el-row style="line-height: 46px">
@@ -702,7 +706,8 @@
          this.$api.url.writeTechById + `?id=${this.upData.id}`,
            {
                deviceGroup: this.upData.device_group,
                elementId:this.cell.join(','),
                element:JSON.stringify(this.cell.split(',')),
                // element:JSON.stringify(this.form.elementId.split(','))
                father: this.edit.father,
                name: this.edit.name,
                type: this.edit.type
@@ -863,13 +868,27 @@
        })
        .then((res) => {
          this.edit = res.data[0];
          console.log(this.edit.children);
          this.cell = this.edit.children.map(el => {
                    return el.id
                })
          // this.cell = this.cell.join(',')
          // this.cell = nn
          // console.log(this.cell);
          this.cell = this.edit.element
          console.log(this.cell);
          let cc = JSON.parse(this.cell).join(",")
          console.log(cc);
          this.cell = cc
          console.log(this.cell);
        //   this.cell = this.edit.children.map(el => {
                //     return el.id
                // })
        //   this.cell = this.cell.join(',')
        //   this.cell = nn
        //   console.log(this.cell);



          //  let cc = this.edit.element.join(", ")
          //  let str = cc.join(", ");
            // let cc = JSON.parse(this.edit.element)
            // console.log(cc);
            // console.log(gg);
            // console.log(json.parse(gg));

        });
    },