|
|
@@ -42,9 +42,22 @@
|
|
|
></DictSelection>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6">
|
|
|
+ <el-col :span="6" style="height: 58px">
|
|
|
+ <el-form-item label="班组/个人" prop="assignType">
|
|
|
+ <el-select
|
|
|
+ v-model="form.assignType"
|
|
|
+ size="small"
|
|
|
+ @change="typeChange"
|
|
|
+ style="width: 100%"
|
|
|
+ :disabled="btnType == 'detail' || btnType == 'issued'"
|
|
|
+ >
|
|
|
+ <el-option :value="1" label="班组"></el-option>
|
|
|
+ <el-option :value="0" label="个人"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <!-- <el-col :span="6">
|
|
|
<el-form-item label="计量类型" prop="inspectionStandards">
|
|
|
- <!-- 计量 计重 -->
|
|
|
<el-select
|
|
|
style="width: 100%"
|
|
|
v-model="form.inspectionStandards"
|
|
|
@@ -65,7 +78,7 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
+ </el-col> -->
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
@@ -88,20 +101,36 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6" style="height: 58px">
|
|
|
- <el-form-item label="班组/个人" prop="assignType">
|
|
|
+ <el-col :span="6" v-if="!form.assignType">
|
|
|
+ <el-form-item label="接收部门:" prop="groupId">
|
|
|
+ <deptSelect
|
|
|
+ :disabled="btnType == 'detail'"
|
|
|
+ v-model="form.groupId"
|
|
|
+ filterable
|
|
|
+ company-scope
|
|
|
+ @changeGroup="searchDeptNodeClick"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" v-if="!form.assignType">
|
|
|
+ <el-form-item label="接收人:" prop="executeId">
|
|
|
<el-select
|
|
|
- v-model="form.assignType"
|
|
|
- size="small"
|
|
|
- @change="typeChange"
|
|
|
+ :disabled="btnType == 'detail'"
|
|
|
+ v-model="form.executeId"
|
|
|
+ @change="changeExecutor"
|
|
|
+ filterable
|
|
|
style="width: 100%"
|
|
|
- :disabled="btnType == 'detail' || btnType == 'issued'"
|
|
|
>
|
|
|
- <el-option :value="1" label="班组"></el-option>
|
|
|
- <el-option :value="0" label="个人"></el-option>
|
|
|
+ <el-option
|
|
|
+ v-for="item in executorList"
|
|
|
+ :key="item.id"
|
|
|
+ :value="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ ></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+
|
|
|
<el-col :span="6" v-if="form.assignType == 1">
|
|
|
<el-form-item label="班组" prop="teamId">
|
|
|
<el-select
|
|
|
@@ -138,35 +167,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6" v-if="!form.assignType">
|
|
|
- <el-form-item label="接收部门:" prop="groupId">
|
|
|
- <deptSelect
|
|
|
- :disabled="btnType == 'detail'"
|
|
|
- v-model="form.groupId"
|
|
|
- filterable
|
|
|
- company-scope
|
|
|
- @changeGroup="searchDeptNodeClick"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6" v-if="!form.assignType">
|
|
|
- <el-form-item label="接收人:" prop="executeId">
|
|
|
- <el-select
|
|
|
- :disabled="btnType == 'detail'"
|
|
|
- v-model="form.executeId"
|
|
|
- @change="changeExecutor"
|
|
|
- filterable
|
|
|
- style="width: 100%"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in executorList"
|
|
|
- :key="item.id"
|
|
|
- :value="item.id"
|
|
|
- :label="item.name"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
+
|
|
|
<el-col :span="18">
|
|
|
<el-form-item label="周期:" prop="frequencyValue">
|
|
|
<rule-cycle
|
|
|
@@ -565,6 +566,15 @@
|
|
|
}
|
|
|
},
|
|
|
immediate: false
|
|
|
+ },
|
|
|
+ /* 编辑/详情回显: 按已保存的接收部门加载人员列表, 否则接收人下拉回显不出姓名 */
|
|
|
+ 'form.groupId': {
|
|
|
+ immediate: true,
|
|
|
+ handler(val) {
|
|
|
+ if (val && !this.executorList.length) {
|
|
|
+ this.getUserList({ groupId: val });
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
data() {
|
|
|
@@ -712,6 +722,9 @@
|
|
|
const params = { groupId: info };
|
|
|
this.getUserList(params);
|
|
|
this.form.groupName = row.name;
|
|
|
+ /* 接收部门与接收人联动: 换部门后原接收人不属于新部门, 清空待重选 */
|
|
|
+ this.form.executeId = null;
|
|
|
+ this.form.executeName = '';
|
|
|
} else {
|
|
|
this.form.executeGroupId = null;
|
|
|
}
|