Merge branch 'master' of http://www.beijingsoft.cn:9090/r/mdc-front

gaosp

2024-01-16 fcb6eb2c02f00b0da864a8915af2afcb285a63a8

 src/container/ledger/Manage-add-update.vue

@@ -8,18 +8,12 @@
      <!-- 添加内容-->

      <el-form  :model="dataForm" label-width="100px" ref="dataForm">

         <el-row :gutter="20">

          <!-- <el-col :xs="24":sm="6":md="6":lg="6":xl="6">

          <el-col :xs="24":sm="6":md="6":lg="6":xl="6">

            <el-form-item label="机床名" prop="machineName">

              <el-select filterable v-model="dataForm.machineName" placeholder="支持模糊查询" clearable>

                <el-option

                  v-for="item in machineNamelist"

                  :key="item.value"

                  :label="item.label"

                  :value="item.value">

                </el-option>

              </el-select>

              <el-input v-model="dataForm.machineName" placeholder="机床名称" clearable></el-input>

            </el-form-item>

          </el-col>

          <!-- 
          <el-col :xs="24":sm="6":md="6":lg="6":xl="6">

            <el-form-item label="机床ip" prop="machineIp">

              <el-input v-model="dataForm.machineIp" placeholder="机床ip" clearable></el-input>

@@ -183,6 +177,7 @@
              </el-select>

            </el-form-item>

          </el-col>

        <!--

          <el-col :xs="24":sm="6":md="6":lg="6":xl="6">

            <el-form-item label="班次" prop="classes">

              <el-select v-model="dataForm.classes" placeholder="---请选择---">

@@ -192,6 +187,7 @@
              </el-select>

            </el-form-item>

          </el-col>

        -->

          <el-col :xs="24":sm="6":md="6":lg="6":xl="6">

            <el-form-item label="生产厂家" prop="manufacturer">

              <el-input v-model="dataForm.manufacturer" placeholder="生产厂家" clearable></el-input>

@@ -275,7 +271,7 @@
      return {

        visible: false,

        dataForm: {

          id: 0, // title显示新增还是修改

          id: '', // title显示新增还是修改

          machineName: '', // 机床名

          machineIp: '', // 机床ip

          workshop: '', // 车间名

@@ -365,7 +361,7 @@
      },

      /* 提交*/

      dataFormSubmit() {

        if (this.dataForm.id === '') { // 新增

        if (!this.dataForm.id) { // 新增

          accountCreate(this.dataForm).then(res => {

            this.$message({

              message: '新增成功',