Merge remote-tracking branch 'origin/master'

jiangping

2024-03-05 a4fc9ef5d32a062a664bda212f9e50632e1b7a86

 company/src/components/enterprise/OperaDispatchUnitWindow.vue

@@ -10,9 +10,9 @@
            <el-form-item label="派遣单位名称" prop="name">
                <el-input v-model="form.name" placeholder="请输入" v-trim/>
            </el-form-item>
            <el-form-item label="派遣单位信用代码" prop="code">
                <el-input v-model="form.code" placeholder="请输入" v-trim/>
            </el-form-item>
<!--            <el-form-item label="派遣单位信用代码" prop="code">-->
<!--                <el-input v-model="form.code" placeholder="请输入" v-trim/>-->
<!--            </el-form-item>-->
            <el-form-item label="派遣单位描述" prop="content">
                <el-input v-model="form.content" placeholder="请输入" v-trim/>
            </el-form-item>
@@ -130,12 +130,12 @@
        name: [
          { required: true, message: '请输入派遣单位名称' }
        ],
        code: [
          { required: true, message: '请输入派遣单位信用代码' }
        ],
        content: [
          { required: true, message: '请输入派遣单位描述' }
        ]
        // code: [
        //   { required: true, message: '请输入派遣单位信用代码' }
        // ],
        // content: [
        //   { required: true, message: '请输入派遣单位描述' }
        // ]
      },
      insuranceScheme: []
    }
@@ -184,8 +184,12 @@
      // 编辑
      this.$nextTick(() => {
        for (const key in this.form) {
          this.form[key] = target[key]
            console.log(key)
            // if (key !== 'saveDuSolutionDTOList') {
                this.form[key] = target[key]
            // }
        }
        console.log(this.form)
      })
    },
      // 确认新建
@@ -227,18 +231,6 @@
          this.$refs.form.validate((valid) => {
              if (!valid) {
                  return
              }
              for (let i = 0; i < this.form.saveDuSolutionDTOList.length; i++) {
                if (!this.form.saveDuSolutionDTOList[i].solutionId) {
                    this.$message.warning(`第${i + 1}项保险方案为空！`)
                    return
                }
                for (let a = 0; a < this.form.saveDuSolutionDTOList[i].saveDuWorkTypeDTOList.length; a++) {
                    if (!this.form.saveDuSolutionDTOList[i].saveDuWorkTypeDTOList[a].workTypeId) {
                        this.$message.warning(`第${i + 1}项保险方案第${a + 1}项工种为空！`)
                        return
                    }
                }
              }
              // 调用新建接口
              this.isWorking = true