Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

 company/src/components/enterprise/confirmJobType.vue

@@ -7,7 +7,7 @@
        @confirm="confirm"
    >
        <el-form class="demo-form-inline">
            <el-form-item label="派遣单位" required>
            <el-form-item label="派遣单位" required v-if="type !== 2">
                <el-select v-model="dw" @change="selectChange" placeholder="请选择">
                    <el-option
                        v-for="item in dispatching"
@@ -45,6 +45,7 @@
                form: {
                    solutionId: ''
                },
                type: null,
                data: [],
                dw: [],
                gz: [],
@@ -59,9 +60,17 @@
                this.gz = ''
                this.form.solutionId = arr.solutionId
                this.data = arr.seleData
                this.type = arr.type
                this.visible = true
                this.options=[]
                this.getFindListByDTO()
                if (arr.type === 2) {
                  worktype({ id: arr.solutionId, queryType: 0 })
                    .then(res => {
                      this.options = res
                    })
                } else {
                  this.getFindListByDTO()
                }
            },
            getFindListByDTO () {
                findListByDTO({
@@ -85,9 +94,16 @@
                    })
            },
            confirm() {
              if(!this.dw || !this.gz){
                this.$message.error("请先选择派遣单位和工种！")
                return;
              if (this.type === 2) {
                if(!this.gz){
                  this.$message.error("请先选择工种！")
                  return;
                }
              } else {
                if(!this.dw || !this.gz){
                  this.$message.error("请先选择派遣单位和工种！")
                  return;
                }
              }
                let obj = {
                    workTypeName: '',