From ce70bd97c7f2577f0978b39b9da1ccdd8d5b768f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 22:50:14 +0800
Subject: [PATCH] 机床增加设备编号
---
src/views/flowmgr/taskassign.vue | 297 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 249 insertions(+), 48 deletions(-)
diff --git a/src/views/flowmgr/taskassign.vue b/src/views/flowmgr/taskassign.vue
index 0ce10ea..a27f14d 100644
--- a/src/views/flowmgr/taskassign.vue
+++ b/src/views/flowmgr/taskassign.vue
@@ -8,44 +8,70 @@
-->
<template>
<basic-container>
- <avue-form ref="form" :option="attachOption" v-model="attachForm" @submit="formSubmit" @blur="handleTrim"></avue-form>
+ <avue-form ref="form" :option="attachOption" v-model="attachForm" @submit="formSubmit"><!-- -->
+ <template #machineCode="{}">
+ <el-tree-select ref="tree" filterable v-model="attachForm.machineCode"
+ node-key="machineCode"
+ :data="treeData" :props="defaultProps">
+ </el-tree-select>
+ </template>
+ <template #drawingNo="{}">
+ <el-autocomplete v-model="attachForm.drawingNo"
+ :fetch-suggestions="querySearchAsync"
+ :trigger-on-focus="false" @select="handleSelect"
+ >
+ </el-autocomplete>
+ </template>
+ <!--
+ <template #programmer="{}">
+ <el-autocomplete ref="autoProgrammer" :disabled="drawingNoMatch" v-model="attachForm.programmer"
+ :fetch-suggestions="queryProgrammerAsync"
+ :trigger-on-focus="false" @select="handleProgrammerSelect"
+ >
+ </el-autocomplete>
+ </template>
+-->
+ </avue-form>
</basic-container>
</template>
<script>
-import {
- getQueryString,
-} from '@/utils/util';
-
export default {
watch: {
'attachForm.drawingNo': function (val) {
if(val && this.attachForm.processNo && this.attachForm.processEdition) {
- this.attachForm.title = `${val}-${this.attachForm.processNo}-${this.attachForm.processEdition}-鏁版帶绋嬪簭缂栧埗`;
+ this.attachForm.title = `${val}-${this.attachForm.processNo}-${this.attachForm.processEdition}-璁″垝浠诲姟`;
+
+
}
},
'attachForm.processNo': function (val) {
if(val && this.attachForm.drawingNo && this.attachForm.processEdition) {
//this.attachForm.title = `${val}-${this.attachForm.processNo}-鏁版帶绋嬪簭缂栧埗`;
- this.attachForm.title = `${this.attachForm.drawingNo}-${val}-${this.attachForm.processEdition}-鏁版帶绋嬪簭缂栧埗`;
+ this.attachForm.title = `${this.attachForm.drawingNo}-${val}-${this.attachForm.processEdition}-璁″垝浠诲姟`;
}
},
'attachForm.processEdition': function (val) {
if(val && this.attachForm.drawingNo && this.attachForm.processNo ) {
//this.attachForm.title = `${val}-${this.attachForm.processNo}-鏁版帶绋嬪簭缂栧埗`;
- this.attachForm.title = `${this.attachForm.drawingNo}-${this.attachForm.processNo}-${val}-鏁版帶绋嬪簭缂栧埗`;
+ this.attachForm.title = `${this.attachForm.drawingNo}-${this.attachForm.processNo}-${val}-璁″垝浠诲姟`;
}
},
},
data() {
-
- var isTempFlow = getQueryString("isTempFlow");
- isTempFlow = isTempFlow === 'Y'?'Y':'N';
-
var that = this;
return {
form: {},
- machineCodeList: [],
+
+ treeData: [],
+ defaultProps: {
+ children: 'children',
+ label: 'name',
+ disabled: (data) => data.nodeType!=='machine',//浠呮満搴婅妭鐐瑰彲閫�
+ isLeaf: (data) => !data.hasChildren
+ },
+ timeout:0, //闆朵欢鍙峰姞杞界殑timeout
+ //drawingNoMatch:true,//闆朵欢鍙锋槸鍚﹀尮閰嶅垎宸ヨ〃
attachOption: {
labelWidth: 160,
submitBtn: true,
@@ -57,11 +83,8 @@
prop: 'title',
type: 'input',
span: 24,
- dataType: 'string',
- rules: [{ required: true, message: '蹇呭～'}],
- blur: (col) => {
- this.handleTrim(col)
- }
+ disabled:true,
+ dataType: 'string'
},
{
label: '闆剁粍浠跺彿',
@@ -70,12 +93,13 @@
span: 12,
dataType: 'string',
blur: (col) => {
- this.handleTrim(col)
+ this.handleTrim(col);
+
},
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
},
{
- label: '鍥惧彿鐗堟',
+ label: '鍥剧焊鐗堟',
prop: 'drawingNoEdition',
type: 'input',
span: 12,
@@ -132,33 +156,23 @@
},
},
{
- label: '宸ヨ壓鐗堟',
+ label: '鎵规鍙�',
prop: 'craftEdition',
- placeholder:'濡�"A"',
+ placeholder:'濡�"2S24001"',
type: 'input',
span: 12,
dataType: 'string',
maxlength: 10,
- rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
blur: (col) => {
this.handleTrim(col)
},
},
+
{
label: '鍔犲伐鏈哄簥',
prop: 'machineCode',
type: 'select',
- filterable: true,
- dicUrl: `/blade-mdm/machine/page?size=10000`,
- dicFormatter: function (res) {
- that.machineCodeList = res.data.records;
- return res.data.records;
- },
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
- props: {
- label: 'code',
- value: 'code',
- },
span: 12
},
{
@@ -184,23 +198,163 @@
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
},
{
- label: '鍋忕鍗曞彿',
+ label: '涓存椂鏇存敼鍗曞彿',
prop: 'deviation',
type: 'input',
span: 12,
dataType: 'string',
+ class:'input_holder_warn',
+ placeholder:'闈炰复鏃舵洿鏀瑰崟浠诲姟璇风暀绌�',
blur: (col) => {
this.handleTrim(col)
},
// rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
- }
+ },
+ {
+ label: '涓荤宸ヨ壓',
+ prop: 'producePlanId',
+ type: 'select',//column 12
+ clearable:true,
+ remote: true,
+ placeholder:'鏃犳硶鍖归厤浜哄憳鑱岃矗琛ㄦ椂璇烽�夋嫨涓荤宸ヨ壓',
+ dicUrl: `/blade-mdm/producedivision/select-programmer?programmer={{key}}`,
+ dicFormatter:(res)=>{
+ return res.data.map(obj => {
+ let item = new Object();
+ item.value = obj.id;
+ item.label = obj.programmerName;
+ item.desc = `涓撲笟缁勯暱锛�${obj.teamLeaderName},鏍″锛�${obj.checkerName},瀹℃牳锛�${obj.seniorName}`
+ return item;
+ }); ;
+ },
+ span: 12,
+ dataType: 'string',
+ },
+ /*{
+ label: '涓荤宸ヨ壓',
+ prop: 'programmer',
+ type: 'input',//column 12
+ span: 12,
+ dataType: 'string',
+ },*/
],
},
- attachForm: {planLockDays:7},//榛樿7澶�
+ attachForm: {planLockDays:7,planStartTime: this.$dayjs().format('YYYY-MM-DD')},//榛樿7澶�
+ defaultForm: {planLockDays:7,planStartTime: this.$dayjs().format('YYYY-MM-DD')},
};
},
methods: {
+ treeLoad () {
+ axios({
+ url: '/blade-mdm/gkw/node/load-tree',
+ method: 'get',
+ }).then(
+ res => {
+ this.treeData = this.filterTreeData(res.data.data);
+ var firstIndex = 0;
+ res.data.data.forEach((item,index)=> {
+ if(item.children.length != 0) {
+ firstIndex = index;
+ }
+ })
+ //defaultKeys.push(item.id);
+ this.defaultKeys = [res.data.data[firstIndex].id];
+ }
+ )
+ },
+ filterTreeData(oriTreeData){
+ var roots = [];
+ for(var i=0;i<oriTreeData.length;i++){
+ roots.push(this.filterTreeNodes(oriTreeData[i]));
+ }
+ return roots;
+ },
+ filterTreeNodes(node) {
+ // 濡傛灉褰撳墠鑺傜偣鐨刵odeType鏄�'machine'锛屽垯娓呴櫎鍏跺瓙鑺傜偣
+ if (node.nodeType === 'machine') {
+ // 鍒涘缓涓�涓柊瀵硅薄锛屽鍒跺綋鍓嶈妭鐐圭殑灞炴�э紝浣嗘竻闄hildren
+ return {
+ ...node,
+ children: []
+ };
+ }
+
+ // 濡傛灉褰撳墠鑺傜偣鏈夊瓙鑺傜偣锛岄�掑綊澶勭悊姣忎釜瀛愯妭鐐�
+ if (node.children && node.children.length > 0) {
+ return {
+ ...node,
+ children: node.children.map(child => this.filterTreeNodes(child))
+ };
+ }
+
+ // 濡傛灉鏃笉鏄痬achine鑺傜偣涔熸病鏈夊瓙鑺傜偣锛岀洿鎺ヨ繑鍥炲師鑺傜偣
+ return node;
+ },
+ querySearchAsync(query, cb) {//闆剁粍浠跺彿鎼滅储寤鸿
+ axios({
+ url: '/blade-mdm/producedivision/select-data',
+ method: 'get',
+ params: {drawingNo: query},
+ }).then(
+ res => {
+ if(res.data.code == 200){
+ let list = res.data.data;
+ for(let i of list){
+ i.value = i.ljh;
+ }
+
+ clearTimeout(this.timeout)
+ this.timeout = setTimeout(() => {
+ cb(list);
+ }, 1000)
+
+ }
+ },
+ error => {
+ console.log(error);
+ }
+ );
+
+ },
+ handleSelect(item) {
+ this.attachForm.productModel = item.cph;
+ },
+ /*
+ queryProgrammerAsync(query, cb) {//涓荤宸ヨ壓鎼滅储寤鸿
+ axios({
+ url: '/blade-mdm/producedivision/select-programmer',
+ method: 'get',
+ params: {programmer: query},
+ }).then(
+ res => {
+ if(res.data.code == 200){
+ let list = res.data.data;
+ for(let i of list){
+ i.value = '涓荤宸ヨ壓锛�'+i.programmerName+',鏍″锛�'+i.checkerName;
+ }
+
+ clearTimeout(this.timeout)
+ this.timeout = setTimeout(() => {
+ cb(list);
+ }, 600)
+
+ }
+ },
+ error => {
+ console.log(error);
+ }
+ );
+
+ },
+ */
+ /*
+ handleProgrammerSelect(item){
+ this.attachForm.producePlanId = item.id;
+ this.attachForm.planDrawingNo = this.attachForm.drawingNo;//璁板綍姝ゆ椂鐨勯浂缁勪欢鍙�
+ console.log('productid',this.attachForm )
+
+ },*/
handleTrim(col){
//console.log(col)
let value = this.attachForm[col.column.prop];
@@ -215,23 +369,59 @@
},
formSubmit(form, done) {
var form = { ...form };
- this.machineCodeList.forEach(item => {
- if (form.machineCode == item.code) {
- form.machineMode = item.name;
- }
- })
-
+
+ if(this.attachForm.producePlanId){
+ //鎵嬪姩鎸囧畾浜嗕汉鍛樿亴璐ｈ〃id锛屼笉鐢ㄧ户缁粠鏈嶅姟绔獙璇�
+ this.startDispatch(form,done);
+ }else{
+ axios({
+ url: '/blade-mdm/producedivision/select-by-drawingno',
+ method: 'get',
+ params: {drawingNo:this.attachForm.drawingNo},
+ }).then(
+ res => {
+
+ if(res.data.code == 200){
+
+ this.attachForm.producePlanId = res.data.data.id;
+ //this.drawingNoMatch = true;
+ console.log('planid',this.attachForm.productPlanId)
+ this.startDispatch(form,done);
+ }else{
+ //this.drawingNoMatch = false;
+
+ this.$alert(res.data.msg+".閲嶆柊杈撳叆鎴栬�呮墜鍔ㄩ�夋嫨涓荤宸ヨ壓銆�", '鍙戣捣浠诲姟澶辫触',{type:'error',confirmButtonText:'鍏抽棴'});
+ }
+ done();
+ },
+ error => {
+ console.log(error);
+ done();
+ }
+ );
+ }
+
+ },
+ startDispatch(form,done){
+ //楠岃瘉閮介�氳繃浜嗭紝鎵ц鍚姩娴佺▼
axios({
url: '/blade-mdm/flow/dispatch/start',
method: 'post',
data: form,
}).then(
res => {
- this.$message({
- type: 'success',
- message: '鎿嶄綔鎴愬姛!',
- });
- this.$refs.form.resetForm();
+
+ if(res.data.code == 200){
+ this.$message({
+ type: 'success',
+ message: '鎿嶄綔鎴愬姛!',
+ });
+ this.$refs.form.resetForm();
+ this.attachForm = this.defaultForm;
+ //this.drawingNoMatch = true;
+ }else{
+ this.$alert(res.data.msg, '鍙戣捣浠诲姟澶辫触',{type:'error',confirmButtonText:'鍏抽棴'});
+ }
done();
},
error => {
@@ -263,7 +453,18 @@
}
}
},
+
+ mounted() {
+ this.treeLoad();
+ },
};
</script>
-<style lang="scss"></style>
+<style lang="scss">
+.input_holder_warn {
+ .el-input__inner::placeholder {
+ color: rgb(255, 106, 0); /* 璁剧疆棰滆壊涓虹孩鑹� */
+ font-size: 16px; /* 璁剧疆瀛椾綋澶у皬涓�16px */
+ }
+}
+</style>
--
Gitblit v1.9.3