工艺逻辑提交

dev-scheduling
zhangdi 3 months ago
parent 3d2e75f872
commit eaa341dd59
  1. 9
      src/api/processManagement/taskDispatch.js
  2. 9
      src/views/flowManagement/addDialog.vue
  3. 76
      src/views/processManagement/components/addTestDialog.vue

@ -23,9 +23,10 @@ export const setDispatch = params => {
}; };
// 根据角色ID获取工艺员列表 // 根据角色ID获取工艺员列表
export const getRoleUserList = () =>{ export const getRoleUserList = (params) =>{
return request({ return request({
url:'/blade-system/user/list-process-engineer', url: '/blade-system/user/page',
method:'get', method: 'get',
}) params: params
});
} }

@ -319,6 +319,7 @@
<script> <script>
import { addProcess } from '../../api/flowManagement/index'; import { addProcess } from '../../api/flowManagement/index';
import { getRoleUserList } from '@/api/processManagement/taskDispatch';
export default { export default {
name: 'AddDialog', name: 'AddDialog',
props: { props: {
@ -425,7 +426,15 @@ export default {
return this.title === '详情'; return this.title === '详情';
}, },
}, },
mounted(){
this.getRoleUserList();
},
methods: { methods: {
getRoleUserList(){
getRoleUserList().then(res => {
this.memberList = res.data.data;
});
},
handleClose() { handleClose() {
this.$emit('close ', false); this.$emit('close ', false);
this.formError = ''; this.formError = '';

@ -10,8 +10,19 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="零件号:" prop="partId"> <el-form-item label="零件号:" prop="partId">
<el-select v-model="ruleForm.partId" placeholder="请输入" @change="partChange" clearable filterable> <el-select
<el-option v-for="(item,index) in getPartOptions" :key="index" :label="item.partName" :value="item.id" /> v-model="ruleForm.partId"
placeholder="请输入"
@change="partChange"
clearable
filterable
>
<el-option
v-for="(item, index) in getPartOptions"
:key="index"
:label="item.partName"
:value="item.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -21,14 +32,24 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工艺版本号:" prop="version"> <el-form-item label="工艺版本号:" prop="version">
<el-select v-model="ruleForm.version" placeholder="请输入" clearable filterable> <el-select v-model="ruleForm.version" placeholder="请输入" clearable filterable>
<el-option v-for="(item,index) in versionOptions" :key="index" :label="item.partVersion" :value="item.partVersion" /> <el-option
v-for="(item, index) in versionOptions"
:key="index"
:label="item.partVersion"
:value="item.partVersion"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工艺员:" prop="craftMan"> <el-form-item label="工艺员:" prop="craftMan">
<el-select v-model="ruleForm.craftMan" placeholder="请输入" clearable filterable> <el-select v-model="ruleForm.craftMan" placeholder="请输入" clearable filterable>
<el-option v-for="(item,index) in craftManOptions" :key="index" :label="item.realName" :value="item.id" /> <el-option
v-for="(item, index) in craftManOptions"
:key="index"
:label="item.realName"
:value="item.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -48,7 +69,7 @@
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { getPartList,getVersion,saveTask } from '@/api/processManagement/taskProcessing'; import { getPartList, getVersion, saveTask } from '@/api/processManagement/taskProcessing';
import { getRoleUserList } from '@/api/processManagement/taskDispatch'; import { getRoleUserList } from '@/api/processManagement/taskDispatch';
export default { export default {
props: { props: {
@ -63,50 +84,53 @@ export default {
openShow: false, openShow: false,
ruleForm: { ruleForm: {
partId: null, partId: null,
taskType:'6' taskType: '6',
}, },
rules: { rules: {
partId: [{ required: true, message: '请选择', trigger: 'blur' }], partId: [{ required: true, message: '请选择', trigger: 'blur' }],
version: [{ required: true, message: '请选择', trigger: 'blur' }], version: [{ required: true, message: '请选择', trigger: 'blur' }],
craftMan: [{ required: true, message: '请选择', trigger: 'blur' }], craftMan: [{ required: true, message: '请选择', trigger: 'blur' }],
}, },
getPartOptions: [],// getPartOptions: [], //
versionOptions: [],// versionOptions: [], //
craftManOptions: [],// craftManOptions: [], //
}; };
}, },
mounted() { mounted() {
this.openShow = this.showDialog; this.openShow = this.showDialog;
this.getPartList(); this.getPartList();
this.getRoleUserList() this.getRoleUserList();
}, },
methods: { methods: {
getRoleUserList(){ getRoleUserList() {
getRoleUserList().then(res=>{ getRoleUserList({ current: 1, size: 99999 }).then(res => {
this.craftManOptions = res.data.data; this.craftManOptions = res.data.data.records
}) ;
});
}, },
getPartList() { getPartList() {
getPartList().then(response => { getPartList().then(response => {
this.getPartOptions = response.data.data; this.getPartOptions = response.data.data;
}); });
}, },
partChange(){ partChange() {
getVersion({partId:this.ruleForm.partId}).then(res=>{ getVersion({ partId: this.ruleForm.partId }).then(res => {
this.versionOptions = res.data.data; this.versionOptions = res.data.data;
}) });
}, },
submit() { submit() {
this.$refs.ruleFormRef.validate(valid => { this.$refs.ruleFormRef.validate(valid => {
if (valid) { if (valid) {
// code // code
let part = this.getPartOptions.find(item=>item.id === this.ruleForm.partId); let part = this.getPartOptions.find(item => item.id === this.ruleForm.partId);
console.log(8888,part); console.log(8888, part);
// this.ruleForm.partCode = part.partCode; // this.ruleForm.partCode = part.partCode;
saveTask({...this.ruleForm,partCode: part.partCode,partName: part.partName}).then(res=>{ saveTask({ ...this.ruleForm, partCode: part.partCode, partName: part.partName }).then(
this.$message.success('新增成功'); res => {
this.closeDialog(); this.$message.success('新增成功');
}) this.closeDialog();
}
);
} }
}); });
}, },

Loading…
Cancel
Save