From 217bffa9704f2938391977605dcaae1a8baae86f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 10 九月 2025 16:00:41 +0800
Subject: [PATCH] 修改首页搜索错误
---
src/views/flowmgr/taskassigntemp.vue | 57 ++++++++++++++++++
src/views/flowmgr/taskassign.vue | 50 +++++++++++-----
src/views/wel/shemi.vue | 42 ++++++++-----
3 files changed, 114 insertions(+), 35 deletions(-)
diff --git a/src/views/flowmgr/taskassign.vue b/src/views/flowmgr/taskassign.vue
index 66c4599..c903151 100644
--- a/src/views/flowmgr/taskassign.vue
+++ b/src/views/flowmgr/taskassign.vue
@@ -22,7 +22,7 @@
>
</el-autocomplete>
</template>
-
+ <!--
<template #programmer="{}">
<el-autocomplete ref="autoProgrammer" :disabled="drawingNoMatch" v-model="attachForm.programmer"
:fetch-suggestions="queryProgrammerAsync"
@@ -30,16 +30,12 @@
>
</el-autocomplete>
</template>
-
+-->
</avue-form>
</basic-container>
</template>
<script>
-import {
- getQueryString,
-} from '@/utils/util';
-
export default {
watch: {
'attachForm.drawingNo': function (val) {
@@ -75,7 +71,7 @@
isLeaf: (data) => !data.hasChildren
},
timeout:0, //闆朵欢鍙峰姞杞界殑timeout
- drawingNoMatch:true,//闆朵欢鍙锋槸鍚﹀尮閰嶅垎宸ヨ〃
+ //drawingNoMatch:true,//闆朵欢鍙锋槸鍚﹀尮閰嶅垎宸ヨ〃
attachOption: {
labelWidth: 160,
submitBtn: true,
@@ -216,12 +212,30 @@
},
{
label: '涓荤宸ヨ壓',
- prop: 'programmer',
- type: 'input',//column 12
- disabled:true,
+ prop: 'producePlanId',
+ type: 'select',//column 12
+ 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.checkerName}`
+ return item;
+ }); ;
+ },
span: 12,
dataType: 'string',
},
+ /*{
+ label: '涓荤宸ヨ壓',
+ prop: 'programmer',
+ type: 'input',//column 12
+ span: 12,
+ dataType: 'string',
+ },*/
],
},
attachForm: {planLockDays:7,planStartTime: this.$dayjs().format('YYYY-MM-DD')},//榛樿7澶�
@@ -305,7 +319,7 @@
handleSelect(item) {
this.attachForm.productModel = item.cph;
},
-
+ /*
queryProgrammerAsync(query, cb) {//涓荤宸ヨ壓鎼滅储寤鸿
axios({
url: '/blade-mdm/producedivision/select-programmer',
@@ -332,12 +346,14 @@
);
},
+ */
+ /*
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];
@@ -353,7 +369,7 @@
formSubmit(form, done) {
var form = { ...form };
console.log('submit',form);
- if(this.attachForm.planDrawingNo == this.attachForm.drawingNo && this.attachForm.producePlanId){
+ if(this.attachForm.producePlanId){
//鎵嬪姩鎸囧畾浜嗕汉鍛樿亴璐ｈ〃id锛屼笉鐢ㄧ户缁粠鏈嶅姟绔獙璇�
this.startDispatch(form,done);
}else{
@@ -371,13 +387,13 @@
});
this.attachForm.producePlanId = res.data.data.id;
- this.drawingNoMatch = true;
+ //this.drawingNoMatch = true;
console.log('planid',this.attachForm.productPlanId)
this.startDispatch(form,done);
}else{
- this.drawingNoMatch = false;
+ //this.drawingNoMatch = false;
- this.$alert(res.data.msg+".鎴栬�呮墜鍔ㄩ�夋嫨涓荤宸ヨ壓銆�", '鍙戣捣浠诲姟澶辫触',{type:'error',confirmButtonText:'鍏抽棴'});
+ this.$alert(res.data.msg+".閲嶆柊杈撳叆鎴栬�呮墜鍔ㄩ�夋嫨涓荤宸ヨ壓銆�", '鍙戣捣浠诲姟澶辫触',{type:'error',confirmButtonText:'鍏抽棴'});
}
done();
},
@@ -405,7 +421,7 @@
});
this.$refs.form.resetForm();
this.attachForm = this.defaultForm;
- this.drawingNoMatch = true;
+ //this.drawingNoMatch = true;
}else{
this.$alert(res.data.msg, '鍙戣捣浠诲姟澶辫触',{type:'error',confirmButtonText:'鍏抽棴'});
}
diff --git a/src/views/flowmgr/taskassigntemp.vue b/src/views/flowmgr/taskassigntemp.vue
index 8cbc96c..c86e2ac 100644
--- a/src/views/flowmgr/taskassigntemp.vue
+++ b/src/views/flowmgr/taskassigntemp.vue
@@ -191,7 +191,25 @@
dataType: 'string',
rules: [{ required: true, message: '蹇呭～', trigger: 'blur' }],
},
-
+ {
+ label: '涓荤宸ヨ壓',
+ prop: 'producePlanId',
+ type: 'select',//column 12
+ 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.checkerName}`
+ return item;
+ }); ;
+ },
+ span: 12,
+ dataType: 'string',
+ },
{
type:'hidden',
prop:'isTempFlow',
@@ -299,7 +317,44 @@
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.$message({
+ type: 'success',
+ message: '鎿嶄綔鎴愬姛!',
+ });
+
+ this.attachForm.producePlanId = res.data.data.id;
+
+ console.log('planid',this.attachForm.productPlanId)
+ this.startDispatch(form,done);
+ }else{
+
+
+ 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',
diff --git a/src/views/wel/shemi.vue b/src/views/wel/shemi.vue
index cb25812..195c1be 100644
--- a/src/views/wel/shemi.vue
+++ b/src/views/wel/shemi.vue
@@ -16,7 +16,7 @@
</el-col>
<el-col :span="6" class="search-data-flex">
<span class="search-data-title">闆剁粍浠跺彿:</span>
- <el-select v-model="searchTreeData.drawingNo" filterable remote reserve-keyword placeholder="杈撳叆鑷冲皯3涓瓧绗﹁繃婊ゆ暟鎹�"
+ <el-select v-model="searchTreeData.drawingNo" clearable filterable remote reserve-keyword placeholder="杈撳叆鑷冲皯3涓瓧绗﹁繃婊ゆ暟鎹�"
:remote-method="remoteMethod" :loading="searchLoading">
<el-option v-for="item in drawingNoList" :key="item.value" :label="item.label"
:value="item.value" /></el-select>
@@ -43,15 +43,16 @@
<template #name="{ row }">
<span>{{ row.name }}</span>
- <!-- 鏇挎崲 v-if="permission.auto_dispatch"-->
- <el-button :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,1,') > -1"
+ <!-- 鏇挎崲 v-if="permission.auto_dispatch" icon="el-icon-unlock"-->
+ <el-button class="treebtn" :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,1,') > -1"
icon="el-icon-switch" type="primary" @click="replacement(row)" placeholder="鏇挎崲" title="鏇挎崲"></el-button>
- <el-button :size="size" text
- v-if="permission.lock_button && row.nodeType == 60 && row.parentIds.indexOf('0,2') > -1 && row.isLocked != 1"
- icon="el-icon-lock" type="primary" @click="showLockDlg(row)" placeholder="閿佸畾" title="閿佸畾"></el-button>
- <el-button :size="size" text
- v-if="permission.lock_button && row.nodeType == 60 && row.parentIds.indexOf('0,2') > -1 && row.isLocked == 1"
- icon="el-icon-unlock" type="primary" @click="showUnLockDlg(row)" placeholder="瑙ｉ攣" title="瑙ｉ攣"></el-button>
+ <!---->
+ <el-button icon="el-icon-unlock" class="treebtn" v-if="permission.lock_button && row.nodeType == 60 && row.parentIds.indexOf('0,2') > -1 && row.isLocked != 1"text type="primary" @click="showLockDlg(row)" placeholder="閿佸畾" title="閿佸畾"></el-button>
+
+ <el-button icon="el-icon-lock" class="treebtn" :size="size" text
+ v-if="permission.lock_button && row.nodeType == 60 && row.parentIds.indexOf('0,2') > -1 && row.isLocked == 1"
+ type="primary" @click="showUnLockDlg(row)" placeholder="瑙ｉ攣" title="瑙ｉ攣"></el-button>
+
</template>
</avue-crud>
</div>
@@ -71,7 +72,7 @@
</el-col>
<el-col :span="4" class="search-data-flex">
<span class="search-data-title">闆剁粍浠跺彿:</span>
- <el-select v-model="searchTreeData.drawingNo" filterable remote reserve-keyword placeholder="杈撳叆鑷冲皯3涓瓧绗﹁繃婊ゆ暟鎹�"
+ <el-select v-model="searchTreeData.drawingNo" clearable filterable remote reserve-keyword placeholder="杈撳叆鑷冲皯3涓瓧绗﹁繃婊ゆ暟鎹�"
:remote-method="remoteMethod" :loading="searchLoading">
<el-option v-for="item in drawingNoList" :key="item.value" :label="item.label"
:value="item.value" /></el-select>
@@ -101,14 +102,14 @@
<span>{{ row.name }}</span>
<!-- 鏇挎崲 v-if="permission.auto_dispatch"-->
- <el-button :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,1,') > -1"
+ <el-button class="treebtn" :size="size" text v-if="row.nodeType == 60 && row.parentIds.indexOf('0,1,') > -1"
icon="el-icon-switch" type="primary" @click="replacement(row)" placeholder="鏇挎崲" title="鏇挎崲"></el-button>
- <el-button :size="size" text
+ <el-button class="treebtn" :size="size" text
v-if="permission.lock_button && row.nodeType == 60 && row.parentIds.indexOf('0,2') > -1 && row.isLocked != 1"
- icon="el-icon-lock" type="primary" @click="showLockDlg(row)" placeholder="閿佸畾" title="閿佸畾"></el-button>
- <el-button :size="size" text
+ icon="el-icon-unlock" type="primary" @click="showLockDlg(row)" placeholder="閿佸畾" title="閿佸畾"></el-button>
+ <el-button class="treebtn" :size="size" text
v-if="permission.lock_button && row.nodeType == 60 && row.parentIds.indexOf('0,2') > -1 && row.isLocked == 1"
- icon="el-icon-unlock" type="primary" @click="showUnLockDlg(row)" placeholder="瑙ｉ攣" title="瑙ｉ攣"></el-button>
+ icon="el-icon-lock" type="primary" @click="showUnLockDlg(row)" placeholder="瑙ｉ攣" title="瑙ｉ攣"></el-button>
</template>
</avue-crud>
</div>
@@ -179,7 +180,10 @@
</template>
<script>
+
+import { Delete, Edit, Search, Share, Upload ,Lock,Unlock} from '@element-plus/icons-vue'
import debounce from 'lodash/debounce';
+
import { ElMessage } from 'element-plus';
import TodolistLeft from './components/TodolistLeft.vue';
import TodolistRightTop from './components/TodolistRightTop.vue';
@@ -192,6 +196,7 @@
data() {
let rejectText = '椹冲洖';//+this.row.categoryName;
return {
+ size:'large',//鏍戦噷鎸夐挳鐨勫昂瀵�
isSearch: null,
treeSearchLoad: false,
drawingNoList: [],
@@ -982,10 +987,10 @@
});
},
searchTree() {
- if (this.searchTreeData.programStatus.length == 0 || this.searchTreeData.drawingNo == ""){
+ if (this.searchTreeData.programStatus.length == 0 || !this.searchTreeData.drawingNo){
this.$message.warning('璇疯緭鍏ョ▼搴忕姸鎬佸拰闆剁粍浠跺彿杩涜鎼滅储');
return;
- }
+ }
this.treeSearchLoad = true;
this.isSearch = !this.isSearch
@@ -1393,6 +1398,9 @@
</script>
<style lang="scss">
+.treebtn {
+ font-size:16px;
+}
.norightmenu .avue-crud .avue-crud__header {
display: none !important;
}
--
Gitblit v1.9.3