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

rk

2025-09-28 081b2afc94c32a1c5e735e2f6b971d9fe1ff9b4f

 admin/src/components/business/OperaInternalCompanyWindow.vue

@@ -18,10 +18,10 @@
            <el-form-item label="排序码" prop="sortnum">
                <el-input v-model="form.sortnum" placeholder="请输入排序码" v-trim/>
            </el-form-item>
          <el-form-item label="组织类型" prop="type" v-if="(editType === 'edit' && parentId) || (editType === 'add')">
          <el-form-item label="组织类型" prop="type" v-if="(editType === 'edit' && parentId) || (editType === 'add')" >
            <el-radio-group v-model="form.type" :disabled="(editType === 'edit') || (!!(editType === 'add' && parentId))">
              <el-radio :label="0">相关方组织</el-radio>
              <el-radio :label="1">内部组织</el-radio>
<!--              <el-radio :label="1">内部组织</el-radio>-->
            </el-radio-group>
          </el-form-item>
        </el-form>
@@ -90,7 +90,8 @@
        parentId: null,
        disable: false,
        parentName: '',
        parentType:null
        parentType: null,
        sortnum: null
      }
      if (target != null) {
        this.form.parentId = target.id
@@ -129,7 +130,8 @@
          this.api.create({
            parentId: this.form.parentId,
            name: this.form.name,
            type: this.form.type
            type: this.form.type,
            sortnum: this.form.sortnum
          })
            .then(() => {
              this.visible = false
@@ -147,7 +149,8 @@
            id: this.form.id,
            parentId: this.form.parentId,
            name: this.form.name,
            type: this.form.type
            type: this.form.type,
            sortnum: this.form.sortnum
          })
            .then(() => {
              this.visible = false