From 1df7afac983f8e63a3839795f9f1e0858f995f81 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 28 一月 2026 14:36:59 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/system/user/GyDriver.vue | 756 ++++++++++---------------------------------
src/views/logistics/transportGPS/WL_YayBill.vue | 203 +++++++++--
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 2
3 files changed, 343 insertions(+), 618 deletions(-)
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 66c4ddb..7bdf247 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -976,7 +976,7 @@
this.gyCarShow = true
this.openData = true
} else if (num == 15) {
- this.dialogTitle = '杞﹁締鍒楄〃'
+ this.dialogTitle = '鍙告満鍒楄〃'
this.gyDriverShow = true
this.openData = true
} else if (num == 16) {
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 7709a29..d0de9e1 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -172,7 +172,11 @@
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini"
- @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堣垂鐢ㄧ粨绠楀崟锛�</el-button>
+ @click="handlePush(row = rowForm, OperationType = 4)">涓嬫帹锛堣垂鐢ㄧ粨绠楀崟锛�</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
+ @click="openDataDialog(14, form = rowForm)">鍒嗛厤鍙告満</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@@ -281,11 +285,19 @@
<!-- 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁� -->
<PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail" />
<!-- 涓嬫帹 -->
- <el-dialog title="涓嬫帹杩愬崟缁撶畻鍗�" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
- <PayMentOtherBillTranEdit :OperationType='4' :propsData='pushData' :HSouceBillType=this.rowForm.HSourceBillType
- @editClose="pushClose" v-if="pushShow" />
+ <el-dialog title="涓嬫帹杩愬崟缁撶畻鍗�" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox"
+ @close="close">
+ <PayMentOtherBillTranEdit :OperationType='4' :propsData='pushData'
+ :HSouceBillType=this.rowForm.HSourceBillType @editClose="pushClose" v-if="pushShow" />
</el-dialog>
-
+ <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
+ <GyCar @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCarShow" />
+ <GyDriver @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyDriverShow" />
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
+ <el-button @click="deptClose">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
</div>
</div>
</template>
@@ -299,9 +311,11 @@
import PackStockDetail from '@/views/component/PackStockDetail' //鏉＄爜鏄庣粏缁勪欢
import Edit from '@/views/logistics/transportGPS/Add_Edit_WL_YayBill' //缂栬緫椤甸潰缁勪欢
import PayMentOtherBillTranEdit from "@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue"; //缂栬緫椤甸潰缁勪欢
+import GyCar from "@/views/basic/gyCar/gyCarList.vue"
+import GyDriver from "@/views/system/user/GyDriver.vue"
export default {
name: 'WL_YayBill',
- components: { BarCodeDetail,PackStockDetail,Edit,RowSettings,PrintList,PayMentOtherBillTranEdit},
+ components: { BarCodeDetail, PackStockDetail, Edit, RowSettings, PrintList, PayMentOtherBillTranEdit, GyCar, GyDriver },
data() {
return {
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
@@ -351,7 +365,7 @@
openEdit: false, //缂栬緫缁勪欢鏄剧ず鏍囪
pushShow: false,
openPush: false,
- pushData:'',
+ pushData: '',
openPrintList: false, //鎵撳嵃缁勪欢瀹瑰櫒鏄剧ず鏍囪
printListShow: false, //鎵撳嵃缁勪欢鏄剧ず鏍囪
openBtnHide: false, //鎸夐挳缁勪欢瀹瑰櫒鏄剧ず鏍囪
@@ -361,6 +375,11 @@
barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
packStockDetailShow: false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
openVolume: false, //缁存姢闆跺崟鍗犵敤浣撶Н寮圭獥鏍囪
+ openData: false, //鏁版嵁寮圭獥
+ dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
+ gyCarShow: false, //杞﹁締鏁版嵁缁勪欢鏄剧ず鏍囪
+ gyDriverShow: false, //鍙告満鏁版嵁缁勪欢鏄剧ず鏍囪
+ deptform: {}, //寮圭獥閫変腑鏁版嵁
// 鏌ヨ鍙傛暟
sWhere: '', // 鎷兼帴杩囨护鏉′欢
queryParams: { // form鏁版嵁
@@ -448,7 +467,7 @@
//#region 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
- this.rowList=selection
+ this.rowList = selection
this.ids = selection.map(item => item.HInterID)
this.single = selection.length != 1
this.multiple = !selection.length
@@ -804,13 +823,13 @@
this.OperationType = 4
},
//鍏抽棴涓嬫帹椤甸潰
- pushClose(val) {
- this.open = val
- this.pushShow = false
- this.openPush = val
- this.clearData()
- this.getList()
- },
+ pushClose(val) {
+ this.open = val
+ this.pushShow = false
+ this.openPush = val
+ this.clearData()
+ this.getList()
+ },
//#endregion
cancelVolume() {
this.openVolume = false
@@ -862,37 +881,37 @@
},
//#endregion
//#region 鎵撳紑涓嬫帹缁勪欢寮圭獥
- handlePush() {
+ handlePush() {
- if (this.rowList && this.rowList.length > 0) {
- var dataArray = [];
- for (var i = 0; i < this.rowList.length; i++) {
- if (this.rowList[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
- this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
- return;
+ if (this.rowList && this.rowList.length > 0) {
+ var dataArray = [];
+ for (var i = 0; i < this.rowList.length; i++) {
+ if (this.rowList[i].鍗曟嵁鐘舵�� != "宸插鏍�") {
+ this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戜笉涓哄凡瀹℃牳鐘舵��,涓嶅厑璁镐笅鎺紒")
+ return;
+ }
+ if (this.rowList[i].HQtyMust <= 0) {
+ this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
+ return;
+ }
+ var temp = {
+ "HInterID": this.rowList[i].HInterID
+ , "HEntryID": this.rowList[i].HEntryID
+ , "HBillStatus": this.rowList[i].鍗曟嵁鐘舵��
+ }
+ dataArray.push(temp);
+ }
+ var datajson = {
+ "data": dataArray
+ };
+ this.pushData = JSON.stringify(datajson)
+ this.pushShow = true
+ this.openPush = true
+ } else {
+ this.$modal.msgError("璇烽�夋嫨鏁版嵁涓嬫帹锛�")
}
- if (this.rowList[i].HQtyMust <= 0) {
- this.$modal.msgError("涓嬫帹澶辫触锛佹墍閫夊崟鎹��" + this.rowList[i].鍗曟嵁鍙� + "銆戝搴斿彲涓嬫帹鏁伴噺蹇呴』澶т簬 0 锛�")
- return;
- }
- var temp = {
- "HInterID": this.rowList[i].HInterID
- , "HEntryID": this.rowList[i].HEntryID
- , "HBillStatus": this.rowList[i].鍗曟嵁鐘舵��
- }
- dataArray.push(temp);
- }
- var datajson = {
- "data": dataArray
- };
- this.pushData = JSON.stringify(datajson)
- this.pushShow = true
- this.openPush = true
- } else {
- this.$modal.msgError("璇烽�夋嫨鏁版嵁涓嬫帹锛�")
- }
- },
- //#endregion
+ },
+ //#endregion
//#region 鍏抽棴/鍙嶅叧闂�
set_CloseBills(num) {
var InterID = form.hmainid || form.HInterID
@@ -1173,6 +1192,102 @@
return result;
},
//#endregion
+ //#region 鏁版嵁寮圭獥
+ //#region 鎵撳紑鏁版嵁鍒楄〃寮圭獥
+ openDataDialog(num, row) {
+ this.showReset()
+ if (num == 14) {
+ this.dialogTitle = '杞﹁締鍒楄〃'
+ this.gyCarShow = true
+ this.openData = true
+ } else if (num == 15) {
+ this.dialogTitle = '鍙告満鍒楄〃'
+ this.gyDriverShow = true
+ this.openData = true
+ }
+ },
+ //#region 灏嗘暟鎹脊绐楀叏閮ㄥ彇娑堝姞杞�
+ showReset() {
+ this.gyCarShow = false
+ this.gyDriverShow = false
+ },
+ //#endregion
+ //#endregion
+
+ //#region 寮圭獥鏁版嵁鍙屽嚮杩斿洖琛ㄥ崟璧嬪�间簨浠�
+ async dbEmitData(deptRow, num) {
+ let IsAudit = null
+ if (num == 14) {
+ IsAudit = 1
+ } else if (num == 15) {
+ IsAudit = 2
+ }
+ try {
+ const response = await axios.get(this.baseURL + '/WLYayBillController/selectDriver', {
+ params: {
+ "HInterID": this.rowForm.HInterID.toString(),
+ "HcheckID": deptRow.HItemID,
+ "IsAudit": IsAudit,
+ "CurUserName": sessionStorage["HUserName"]
+ },
+ });
+ if (response.data.code == 1) {
+ // return response.data.data[0];
+ if (num == 14) {
+ this.gyCarShow = false
+ this.openData = false
+ this.$modal.msgSuccess(response.data.msg || "杞﹁締娣诲姞鎴愬姛");
+ num = 15
+ this.$nextTick(() => {
+ this.gyDriverShow = true
+ this.openData = true
+ })
+
+ } else if (num == 15) {
+ this.gyDriverShow = false
+ this.openData = false
+ this.$modal.msgSuccess(response.data.msg || "鍙告満娣诲姞鎴愬姛");
+ }
+ } else {
+ this.$modal.msgError(response.data.msg || "鑾峰彇婧愬崟鏁版嵁澶辫触");
+ }
+ } catch (error) {
+ this.$modal.msgError("鑾峰彇婧愬崟鏁版嵁鏃跺彂鐢熼敊璇紝璇风◢鍚庨噸璇�!");
+ }
+ },
+ // dbEmitData(deptRow, num) {
+ // if (num == 14) {
+
+ // this.gyCarShow = false
+ // this.openData = false
+ // } else if (num == 15) {
+ // this.gyDriverShow = false
+ // this.openData = false
+ // }
+ // this.openData = false
+ // },
+ //#endregion
+ //#region 寮圭獥鏁版嵁鍗曞嚮浜嬩欢
+ emitData(deptRow, num) {
+ this.dialogTypeNum = num
+ this.deptform = deptRow
+ },
+ //#endregion
+ //#region 寮圭獥纭畾浜嬩欢
+ deptClickSub() {
+ this.dbEmitData(this.deptform, this.dialogTypeNum)
+ this.deptform = {}
+ },
+ //#endregion
+
+ //#region 寮圭獥鍙栨秷浜嬩欢
+ deptClose() {
+ this.deptform = {}
+ this.openData = false
+ },
+ //#endregion
+ //#endregion
+
}
};
</script>
diff --git a/src/views/system/user/GyDriver.vue b/src/views/system/user/GyDriver.vue
index b010c32..d8b9a4a 100644
--- a/src/views/system/user/GyDriver.vue
+++ b/src/views/system/user/GyDriver.vue
@@ -1,301 +1,143 @@
<template>
<div style="padding: 10px">
<el-card class="search-card" style="margin-bottom: 15px">
- <el-button
- type="text"
- @click="toggleAdvancedSearch"
- style="font-size: 12px; color: #409eff"
- >
- {{ showAdvancedSearch ? "鏀惰捣" : "鏇村" }}
- <i
- :class="
- showAdvancedSearch
- ? 'el-icon-arrow-up'
- : 'el-icon-arrow-down'
- "
- ></i>
- </el-button>
+ <el-button type="text" @click="toggleAdvancedSearch" style="font-size: 12px; color: #409eff">
+ {{ showAdvancedSearch ? "鏀惰捣" : "鏇村" }}
+ <i :class="showAdvancedSearch
+ ? 'el-icon-arrow-up'
+ : 'el-icon-arrow-down'
+ "></i>
+ </el-button>
<div style="margin-top: 15px">
<el-row :gutter="15">
<el-col :span="6">
<div style="display: flex; align-items: center">
- <span style="width: 200px; text-align: right; margin-right: 10px"
- >椹鹃┒鍛樹唬鐮�:</span
- >
- <el-input
- v-model="queryParams.HNumber"
- placeholder="璇疯緭鍏ラ┚椹跺憳浠ｇ爜"
- size="small"
- @keyup.enter.native="handleQuery"
- clearable
- />
+ <span style="width: 200px; text-align: right; margin-right: 10px">椹鹃┒鍛樹唬鐮�:</span>
+ <el-input v-model="queryParams.HNumber" placeholder="璇疯緭鍏ラ┚椹跺憳浠ｇ爜" size="small"
+ @keyup.enter.native="handleQuery" clearable />
</div>
</el-col>
<el-col :span="6">
<div style="display: flex; align-items: center">
- <span style="width: 200px; text-align: right; margin-right: 10px"
- >椹鹃┒鍛樺悕绉�:</span
- >
- <el-input
- v-model="queryParams.HName"
- placeholder="璇疯緭鍏ラ┚椹跺憳鍚嶇О"
- size="small"
- @keyup.enter.native="handleQuery"
- clearable
- />
+ <span style="width: 200px; text-align: right; margin-right: 10px">椹鹃┒鍛樺悕绉�:</span>
+ <el-input v-model="queryParams.HName" placeholder="璇疯緭鍏ラ┚椹跺憳鍚嶇О" size="small"
+ @keyup.enter.native="handleQuery" clearable />
</div>
</el-col>
<el-col :span="6">
<div style="display: flex; align-items: center">
- <span style="width: 100px; text-align: right; margin-right: 10px"
- >缁勭粐:</span
- >
- <el-select
- v-model="queryParams.HUSEORGID"
- placeholder="璇烽�夋嫨缁勭粐"
- size="small"
- style="width: 100%"
- >
- <el-option
- v-for="(item, index) in organizationList"
- :key="index"
- :label="item.Name"
- :value="item.ID"
- >
+ <span style="width: 100px; text-align: right; margin-right: 10px">缁勭粐:</span>
+ <el-select v-model="queryParams.HUSEORGID" placeholder="璇烽�夋嫨缁勭粐" size="small" style="width: 100%">
+ <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</div>
</el-col>
<el-col :span="6">
<div style="display: flex; align-items: center">
- <span style="width: 80px; text-align: right; margin-right: 10px"
- >閲嶆柊鍚屾:</span
- >
- <el-input
- v-model="queryParams.HSyncNumber"
- placeholder="璇疯緭鍏ラ┚椹跺憳浠ｇ爜"
- size="small"
- @keyup.enter.native="handleSync"
- clearable
- style="flex: 1"
- />
- <el-button
- @click="handleSync"
- size="small"
- style="margin-left: 5px"
- >鍚屾</el-button
- >
+ <span style="width: 80px; text-align: right; margin-right: 10px">閲嶆柊鍚屾:</span>
+ <el-input v-model="queryParams.HSyncNumber" placeholder="璇疯緭鍏ラ┚椹跺憳浠ｇ爜" size="small"
+ @keyup.enter.native="handleSync" clearable style="flex: 1" />
+ <el-button @click="handleSync" size="small" style="margin-left: 5px">鍚屾</el-button>
</div>
</el-col>
</el-row>
- <div class="search-header">
- <div style="display: flex; justify-content: space-between; align-items: center">
- <div>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- style="margin-right: 10px"
- >鎼滅储</el-button
- >
- <el-button
- icon="el-icon-refresh"
- size="mini"
- @click="resetQuery"
- style="margin-right: 10px"
- >閲嶇疆</el-button
- >
- <el-button
- icon="el-icon-refresh"
- size="mini"
- @click="getList"
- style="margin-right: 10px"
- >鍒锋柊</el-button
- >
+ <div class="search-header">
+ <div style="display: flex; justify-content: space-between; align-items: center">
+ <div>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+ style="margin-right: 10px">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ style="margin-right: 10px">閲嶇疆</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="getList" style="margin-right: 10px">鍒锋柊</el-button>
+ </div>
</div>
</div>
- </div>
<el-collapse-transition>
<div v-show="showAdvancedSearch">
<div style="margin-top: 15px">
<el-row :gutter="15">
<div style="margin-bottom: 50px">
- <!-- 绗竴缁勮繃婊ゆ潯浠� -->
- <el-col :span="24">
- <div style="display: flex; align-items: center">
- <el-select
- v-model="queryParams.ColName"
- placeholder="璇烽�夋嫨"
- size="small"
- style="flex: 1"
- >
- <el-option label="" value="0"></el-option>
- <el-option
- v-for="(item, index) in filterColumnList"
- :key="index"
- :label="item.field"
- :value="item.field"
- v-if="!item.hide"
- ></el-option>
- </el-select>
- <el-select
- v-model="queryParams.Comparator"
- placeholder="璇烽�夋嫨"
- size="small"
- style="width: 100px; margin: 0 10px"
- >
- <el-option label="" value="0"></el-option>
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- <el-input
- v-model="queryParams.ColContent"
- placeholder="璇疯緭鍏�"
- size="small"
- @keyup.enter.native="handleQuery"
- clearable
- style="flex: 1"
- />
- </div>
- </el-col>
+ <!-- 绗竴缁勮繃婊ゆ潯浠� -->
+ <el-col :span="24">
+ <div style="display: flex; align-items: center">
+ <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" size="small" style="flex: 1">
+ <el-option label="" value="0"></el-option>
+ <el-option v-for="(item, index) in filterColumnList" :key="index" :label="item.field"
+ :value="item.field" v-if="!item.hide"></el-option>
+ </el-select>
+ <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨" size="small"
+ style="width: 100px; margin: 0 10px">
+ <el-option label="" value="0"></el-option>
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="handleQuery" clearable style="flex: 1" />
+ </div>
+ </el-col>
</div>
<div style="margin-bottom: 100px">
- <!-- 绗簩缁勮繃婊ゆ潯浠� -->
- <el-col :span="24">
- <div style="display: flex; align-items: center">
-
- <el-select
- v-model="queryParams.ColName1"
- placeholder="璇烽�夋嫨"
- size="small"
- style="flex: 1"
- >
- <!-- <el-option label="" value="0"></el-option> -->
- <el-option
- v-for="(item, index) in filterColumnList"
- :key="index"
- :label="item.field"
- :value="item.field"
- v-if="!item.hide"
- ></el-option>
- </el-select>
- <el-select
- v-model="queryParams.Comparator1"
- placeholder="璇烽�夋嫨"
- size="small"
- style="width: 100px; margin: 0 10px"
- >
- <!-- <el-option label="" value="0"></el-option> -->
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- <el-input
- v-model="queryParams.ColContent1"
- placeholder="璇疯緭鍏�"
- size="small"
- @keyup.enter.native="handleQuery"
- clearable
- style="flex: 1"
- />
- </div>
- </el-col>
+ <!-- 绗簩缁勮繃婊ゆ潯浠� -->
+ <el-col :span="24">
+ <div style="display: flex; align-items: center">
+
+ <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨" size="small" style="flex: 1">
+ <!-- <el-option label="" value="0"></el-option> -->
+ <el-option v-for="(item, index) in filterColumnList" :key="index" :label="item.field"
+ :value="item.field" v-if="!item.hide"></el-option>
+ </el-select>
+ <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨" size="small"
+ style="width: 100px; margin: 0 10px">
+ <!-- <el-option label="" value="0"></el-option> -->
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" size="small"
+ @keyup.enter.native="handleQuery" clearable style="flex: 1" />
+ </div>
+ </el-col>
</div>
<div style="margin-bottom: 50px">
- <!-- 绗笁缁勮繃婊ゆ潯浠� -->
- <el-col :span="24">
- <div style="display: flex; align-items: center">
- <el-select
- v-model="queryParams.ColName2"
- placeholder="璇烽�夋嫨"
- size="small"
- style="flex: 1"
- >
- <!-- <el-option label="" value="0"></el-option> -->
- <el-option
- v-for="(item, index) in filterColumnList"
- :key="index"
- :label="item.field"
- :value="item.field"
- v-if="!item.hide"
- ></el-option>
- </el-select>
- <el-select
- v-model="queryParams.Comparator2"
- placeholder="璇烽�夋嫨"
- size="big"
- style="width: 100px; margin: 0 10px"
- >
- <el-option label="" value="0"></el-option>
- <el-option
- v-for="(item, index) in comparatorList"
- :key="index"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- <el-input
- v-model="queryParams.ColContent2"
- placeholder="璇疯緭鍏�"
- size="big"
- @keyup.enter.native="handleQuery"
- clearable
- style="flex: 1"
- />
- </div>
- </el-col>
+ <!-- 绗笁缁勮繃婊ゆ潯浠� -->
+ <el-col :span="24">
+ <div style="display: flex; align-items: center">
+ <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨" size="small" style="flex: 1">
+ <!-- <el-option label="" value="0"></el-option> -->
+ <el-option v-for="(item, index) in filterColumnList" :key="index" :label="item.field"
+ :value="item.field" v-if="!item.hide"></el-option>
+ </el-select>
+ <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨" size="big"
+ style="width: 100px; margin: 0 10px">
+ <el-option label="" value="0"></el-option>
+ <el-option v-for="(item, index) in comparatorList" :key="index" :label="item.label"
+ :value="item.value"></el-option>
+ </el-select>
+ <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" size="big"
+ @keyup.enter.native="handleQuery" clearable style="flex: 1" />
+ </div>
+ </el-col>
</div>
</el-row>
</div>
- <div
- v-if="currentFilterScheme"
- style="
+ <div v-if="currentFilterScheme" style="
margin-top: 15px;
padding: 10px;
background-color: #f0f9ff;
border-radius: 4px;
border-left: 4px solid #409eff;
- "
- >
+ ">
<span style="font-size: 14px; font-weight: bold; color: #fc9393">
褰撳墠杩囨护鏂规锛歿{ currentFilterScheme }}
</span>
- <span
- v-if="currentFilterRemark"
- style="font-size: 13px; color: #7b90fb; margin-left: 10px"
- >
+ <span v-if="currentFilterRemark" style="font-size: 13px; color: #7b90fb; margin-left: 10px">
({{ currentFilterRemark }})
</span>
- <el-button
- type="text"
- @click="handleSaveScheme"
- size="mini"
- style="margin-left: 20px"
- >淇濆瓨鏂规</el-button
- >
- <el-button
- type="text"
- @click="handleReadScheme"
- size="mini"
- >璇诲彇鏂规</el-button
- >
- <el-button
- type="text"
- @click="clearFilterScheme"
- size="mini"
- style="color: #f56c6c"
- >娓呴櫎鏂规</el-button
- >
+ <el-button type="text" @click="handleSaveScheme" size="mini" style="margin-left: 20px">淇濆瓨鏂规</el-button>
+ <el-button type="text" @click="handleReadScheme" size="mini">璇诲彇鏂规</el-button>
+ <el-button type="text" @click="clearFilterScheme" size="mini" style="color: #f56c6c">娓呴櫎鏂规</el-button>
</div>
</div>
</el-collapse-transition>
@@ -304,15 +146,8 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-upload2"
- size="mini"
- @click="handleImport"
- id="set_SouceExcel"
- >瀵煎叆</el-button
- >
+ <el-button type="primary" plain icon="el-icon-upload2" size="mini" @click="handleImport"
+ id="set_SouceExcel">瀵煎叆</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@@ -326,190 +161,77 @@
>
</el-col> -->
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAddEdit((OperationType = 1))"
- id="set_add"
- >鏂板</el-button
- >
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAddEdit((OperationType = 1))"
+ id="set_add">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-document-copy"
- size="mini"
- :disabled="single"
- @click="handleCopy"
- id="set_Copy"
- >澶嶅埗</el-button
- >
+ <el-button type="primary" plain icon="el-icon-document-copy" size="mini" :disabled="single" @click="handleCopy"
+ id="set_Copy">澶嶅埗</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleEdit((row = rowForm), (OperationType = 3))"
- id="set_show"
- >缂栬緫</el-button
- >
+ <el-button type="primary" plain icon="el-icon-edit" size="mini" :disabled="single"
+ @click="handleEdit((row = rowForm), (OperationType = 3))" id="set_show">缂栬緫</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="single"
- @click="handleDelete"
- id="set_delete"
- >鍒犻櫎</el-button
- >
+ <el-button type="primary" plain icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete"
+ id="set_delete">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-check"
- size="mini"
- :disabled="single"
- @click="handleAudit(0)"
- id="btn_audit"
- >瀹℃牳</el-button
- >
+ <el-button type="primary" plain icon="el-icon-check" size="mini" :disabled="single" @click="handleAudit(0)"
+ id="btn_audit">瀹℃牳</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-close"
- size="mini"
- :disabled="single"
- @click="handleAudit(1)"
- id="btn_deaudit"
- >鍙嶅鏍�</el-button
- >
+ <el-button type="primary" plain icon="el-icon-close" size="mini" :disabled="single" @click="handleAudit(1)"
+ id="btn_deaudit">鍙嶅鏍�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-turn-off"
- size="mini"
- :disabled="single"
- @click="handleStop(0)"
- id="btn_stop"
- >绂佺敤</el-button
- >
+ <el-button type="primary" plain icon="el-icon-turn-off" size="mini" :disabled="single" @click="handleStop(0)"
+ id="btn_stop">绂佺敤</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-open"
- size="mini"
- :disabled="single"
- @click="handleStop(1)"
- id="btn_destop"
- >鍙嶇鐢�</el-button
- >
+ <el-button type="primary" plain icon="el-icon-open" size="mini" :disabled="single" @click="handleStop(1)"
+ id="btn_destop">鍙嶇鐢�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-setting"
- size="mini"
- @click="handleRowHide"
- id="set_hidecolumn"
- >鍒楄缃�</el-button
- >
+ <el-button type="primary" plain icon="el-icon-setting" size="mini" @click="handleRowHide"
+ id="set_hidecolumn">鍒楄缃�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-s-operation"
- size="mini"
- @click="handleBtnHide"
- id="HideButton"
- >鎸夐挳璁剧疆</el-button
- >
+ <el-button type="primary" plain icon="el-icon-s-operation" size="mini" @click="handleBtnHide"
+ id="HideButton">鎸夐挳璁剧疆</el-button>
</el-col>
</el-row>
<div class="tableBox" v-loading="loading">
- <el-table
- :data="tableData"
- ref="tableData"
- max-height="650"
- @selection-change="handleSelectionChange"
- border
- @row-click="handleRowClick"
- :row-style="rowStyle"
- @cell-dblclick="handleDblclick"
- v-if="tableShow"
- stripe
- >
- <el-table-column
- type="selection"
- width="55"
- align="center"
- fixed="left"
- />
+ <el-table :data="tableData" ref="tableData" max-height="650" @selection-change="handleSelectionChange" border
+ @row-click="handleRowClick" :row-style="rowStyle" @cell-dblclick="handleDblclick" v-if="tableShow" stripe>
+ <el-table-column type="selection" width="55" align="center" fixed="left" />
<template v-for="(item, index) in btList">
- <el-table-column
- :align="item.align"
- :prop="item.field"
- :label="item.title"
- :width="item.width"
- :key="item.field"
- v-if="!item.hide && item.field !== 'checkbox'"
- :sortable="item.sort"
- show-overflow-tooltip
- :fixed="item.fixed"
- >
+ <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width"
+ :key="item.field" v-if="!item.hide && item.field !== 'checkbox'" :sortable="item.sort" show-overflow-tooltip
+ :fixed="item.fixed">
<template slot-scope="{ row, column }">
<div :style="item.style">
<!-- 鏃ユ湡鏍煎紡鍖� -->
- <span
- v-if="
- column.property.includes('鏃ユ湡') ||
- column.property.includes('Date')
- "
- >
+ <span v-if="
+ column.property.includes('鏃ユ湡') ||
+ column.property.includes('Date')
+ ">
{{ parseTime(row[column.property], "{y}-{m}-{d}") }}
</span>
- <el-button
- type="text"
- @click="handleDriverCodeClick(row)"
- v-else-if="column.property === '椹鹃┒鍛樹唬鐮�'"
- style="color: #409eff"
- >{{ row[column.property] }}</el-button
- >
- <span
- v-else-if="column.property === '绂佺敤鏍囪'"
- :style="{
- color: row[column.property] === 'Y' ? '#f56c6c' : '#67c23a',
- fontWeight:
- row[column.property] === 'Y' ? 'bold' : 'normal',
- }"
- >
+ <el-button type="text" @click="handleDriverCodeClick(row)" v-else-if="column.property === '椹鹃┒鍛樹唬鐮�'"
+ style="color: #409eff">{{ row[column.property] }}</el-button>
+ <span v-else-if="column.property === '绂佺敤鏍囪'" :style="{
+ color: row[column.property] === 'Y' ? '#f56c6c' : '#67c23a',
+ fontWeight:
+ row[column.property] === 'Y' ? 'bold' : 'normal',
+ }">
{{ row[column.property] === "Y" ? "宸茬鐢�" : "姝ｅ父" }}
</span>
<!-- 瀹℃牳鐘舵�佺壒娈婃牱寮� -->
- <span
- v-else-if="column.property === '瀹℃牳浜�'"
- :style="{
- color: row[column.property] ? '#67c23a' : '#909399',
- }"
- >
+ <span v-else-if="column.property === '瀹℃牳浜�'" :style="{
+ color: row[column.property] ? '#67c23a' : '#909399',
+ }">
{{ row[column.property] || "鏈鏍�" }}
</span>
<span v-else>{{ row[column.property] }}</span>
@@ -519,48 +241,19 @@
</template>
</el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="page"
- :limit.sync="pageSize"
- :pageSizes="pageSizes"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
+ @pagination="getList" />
<!-- 闅愯棌鍒楄缃脊绐� -->
- <el-dialog
- title="闅愯棌鍒楄缃�"
- :visible.sync="openRowHide"
- width="816px"
- append-to-body
- >
- <RowSettings
- :colName="btResList"
- :HModName="HModName"
- @rowEditClose="rowSetClose"
- v-if="rowHideShow"
- />
+ <el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
+ <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫寮圭獥 -->
- <el-dialog
- :title="editDialogTitle"
- :visible.sync="openEdit"
- width="1480px"
- append-to-body
- class="driver-edit-dialog"
- :before-close="closeEditDialog"
- :close-on-click-modal="false"
- >
- <GyDriverEdit
- :OperationType="OperationType"
- :linterid="rowForm.HItemID"
- :HSouceBillType="''"
- @editCloseGy="editGyClose"
- v-if="editShow"
- ref="editComponent"
- />
+ <el-dialog :title="editDialogTitle" :visible.sync="openEdit" width="1480px" append-to-body
+ class="driver-edit-dialog" :before-close="closeEditDialog" :close-on-click-modal="false">
+ <GyDriverEdit :OperationType="OperationType" :linterid="rowForm.HItemID" :HSouceBillType="''"
+ @editCloseGy="editGyClose" v-if="editShow" ref="editComponent" />
<span slot="footer" class="dialog-footer" v-if="OperationType !== 4">
<!-- <el-button @click="closeEditDialog">鍙� 娑�</el-button>
<el-button type="primary" @click="saveDriverData">淇� 瀛�</el-button> -->
@@ -568,132 +261,47 @@
</el-dialog>
<!-- 瀵煎叆寮圭獥 -->
- <el-dialog
- :title="upload.title"
- :visible.sync="upload.open"
- width="1500px"
- append-to-body
- >
+ <el-dialog :title="upload.title" :visible.sync="upload.open" width="1500px" append-to-body>
<div style="margin-top: -20px">
<el-button type="primary" @click="set_AddNew">瀵煎叆鏁版嵁</el-button>
<el-button type="primary" @click="upload.open = false">閫� 鍑�</el-button>
- <el-upload
- ref="upload"
- :limit="1"
- accept=".xlsx, .xls"
- style="display: inline-block; margin-left: 10px"
- :action="upload.url + '?updateSupport=' + upload.updateSupport"
- :disabled="upload.isUploading"
- :on-progress="handleFileUploadProgress"
- :on-success="handleFileSuccess"
- >
+ <el-upload ref="upload" :limit="1" accept=".xlsx, .xls" style="display: inline-block; margin-left: 10px"
+ :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+ :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess">
<el-button type="primary">鏂囦欢涓婁紶</el-button>
</el-upload>
</div>
- <el-table
- :data="uploadData"
- v-loading="uploadTableLoading"
- :row-class-name="uploadDataIndex"
- border
- height="550"
- >
- <el-table-column
- type="index"
- label="搴忓彿"
- width="55"
- align="center"
- />
- <el-table-column
- label="椹鹃┒鍛樹唬鐮�"
- prop="椹鹃┒鍛樹唬鐮�"
- align="center"
- width="120"
- />
- <el-table-column
- label="椹鹃┒鍛樺悕绉�"
- prop="椹鹃┒鍛樺悕绉�"
- align="center"
- width="120"
- />
- <el-table-column
- label="鑱旂郴鐢佃瘽"
- prop="鑱旂郴鐢佃瘽"
- align="center"
- width="120"
- />
- <el-table-column
- label="椹鹃┒璇佸彿"
- prop="椹鹃┒璇佸彿"
- align="center"
- width="120"
- />
+ <el-table :data="uploadData" v-loading="uploadTableLoading" :row-class-name="uploadDataIndex" border
+ height="550">
+ <el-table-column type="index" label="搴忓彿" width="55" align="center" />
+ <el-table-column label="椹鹃┒鍛樹唬鐮�" prop="椹鹃┒鍛樹唬鐮�" align="center" width="120" />
+ <el-table-column label="椹鹃┒鍛樺悕绉�" prop="椹鹃┒鍛樺悕绉�" align="center" width="120" />
+ <el-table-column label="鑱旂郴鐢佃瘽" prop="鑱旂郴鐢佃瘽" align="center" width="120" />
+ <el-table-column label="椹鹃┒璇佸彿" prop="椹鹃┒璇佸彿" align="center" width="120" />
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="uploadDataDelete(scope.row)"
- >鍒犻櫎</el-button
- >
+ <el-button size="mini" type="text" icon="el-icon-delete"
+ @click="uploadDataDelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="uploadTotal > 0"
- :total="uploadTotal"
- :page.sync="uploadPage"
- :limit.sync="uploadPageSize"
- :pageSizes="uploadPageSizes"
- @pagination="currentPage"
- />
+ <pagination v-show="uploadTotal > 0" :total="uploadTotal" :page.sync="uploadPage" :limit.sync="uploadPageSize"
+ :pageSizes="uploadPageSizes" @pagination="currentPage" />
</el-dialog>
<!-- 杩囨护鏂规寮圭獥 -->
- <el-dialog
- title="杩囨护鏂规鍒楄〃"
- :visible.sync="openFilterScheme"
- width="80%"
- append-to-body
- >
+ <el-dialog title="杩囨护鏂规鍒楄〃" :visible.sync="openFilterScheme" width="80%" append-to-body>
<div style="height: 500px; overflow: auto">
- <el-table
- :data="filterSchemeList"
- border
- style="width: 100%"
- @row-click="selectFilterScheme"
- >
- <el-table-column
- prop="鏂规鍚嶇О"
- label="鏂规鍚嶇О"
- width="200"
- ></el-table-column>
- <el-table-column
- prop="澶囨敞"
- label="澶囨敞"
- width="300"
- ></el-table-column>
+ <el-table :data="filterSchemeList" border style="width: 100%" @row-click="selectFilterScheme">
+ <el-table-column prop="鏂规鍚嶇О" label="鏂规鍚嶇О" width="200"></el-table-column>
+ <el-table-column prop="澶囨敞" label="澶囨敞" width="300"></el-table-column>
<el-table-column prop="鍒涘缓浜�" label="鍒涘缓浜�" width="120"></el-table-column>
- <el-table-column
- prop="鍒涘缓鏃ユ湡"
- label="鍒涘缓鏃ユ湡"
- width="150"
- ></el-table-column>
+ <el-table-column prop="鍒涘缓鏃ユ湡" label="鍒涘缓鏃ユ湡" width="150"></el-table-column>
<el-table-column label="鎿嶄綔" width="150" align="center">
<template slot-scope="scope">
- <el-button
- type="text"
- size="mini"
- @click="applyFilterScheme(scope.row)"
- >搴旂敤</el-button
- >
- <el-button
- type="text"
- size="mini"
- @click="deleteFilterScheme(scope.row)"
- style="color: #f56c6c"
- >鍒犻櫎</el-button
- >
+ <el-button type="text" size="mini" @click="applyFilterScheme(scope.row)">搴旂敤</el-button>
+ <el-button type="text" size="mini" @click="deleteFilterScheme(scope.row)"
+ style="color: #f56c6c">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -701,7 +309,7 @@
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="confirmFilterScheme">纭� 瀹�</el-button>
<el-button @click="openFilterScheme = false">鍙� 娑�</el-button>
-
+
</span>
</el-dialog>
</div>
@@ -743,7 +351,7 @@
{ label: "涓嶅寘鍚�", value: "10" },
],
-
+
sWhere: "",
organizationList: [],
filterColumnList: [],
@@ -824,8 +432,7 @@
async initData() {
try {
const userRes = await axios.get(
- `${this.$baseUrl}/Web/GetUser?UserName=${
- sessionStorage.getItem("UserName") || "001"
+ `${this.$baseUrl}/Web/GetUser?UserName=${sessionStorage.getItem("UserName") || "001"
}&PassWord=123456&HOrgName=100038`
);
if (userRes.data.data && userRes.data.data[0]) {
@@ -853,7 +460,7 @@
async getList() {
this.tableShow = false;
this.loading = true;
- console.log("鑾峰彇鍒楄〃鏁版嵁...",this.sWhere );
+ console.log("鑾峰彇鍒楄〃鏁版嵁...", this.sWhere);
try {
const params = {
sWhere: this.sWhere || "",
@@ -1025,7 +632,7 @@
// conditions.push(`HUSEORGID = '${this.queryParams.HUSEORGID}'`);
// }
-
+
if (this.queryParams.ColName !== "0" && this.queryParams.Comparator !== "0") {
const condition = this.buildCondition(
this.queryParams.ColName,
@@ -1035,7 +642,7 @@
if (condition) conditions.push(condition);
}
-
+
if (
this.queryParams.ColName1 !== "0" &&
this.queryParams.Comparator1 !== "0"
@@ -1060,14 +667,14 @@
if (condition) conditions.push(condition);
}
-
+
if (conditions.length > 0) {
- this.sWhere ="and "+conditions;
+ this.sWhere = "and " + conditions;
}
console.log("鏌ヨ鏉′欢:", this.sWhere);
//this.sWhere += this.addSWhereByOpenType();
- this.page = 1;
+ this.page = 1;
this.getList();
},
@@ -1075,15 +682,15 @@
if (!content) return null;
switch (comparator) {
- case "7":
+ case "7":
return `${colName} like '%${content}%'`;
- case "8":
+ case "8":
return `${colName} like '%${content}'`;
- case "9":
+ case "9":
return `${colName} like '${content}%'`;
- case "10":
+ case "10":
return `${colName} not like '%${content}%'`;
- default:
+ default:
return `${colName} ${comparator} '${content}'`;
}
},
@@ -1148,6 +755,9 @@
// 鐐瑰嚮琛�
handleRowClick(row) {
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 15)
+ }
},
// 琛屾牱寮�
@@ -1398,7 +1008,7 @@
);
},
-
+
parseTime(time, cFormat) {
if (arguments.length === 0) {
return null;
@@ -1584,7 +1194,7 @@
applyFilterScheme(row) {
this.currentFilterScheme = row.鏂规鍚嶇О;
this.currentFilterRemark = row.澶囨敞;
-
+
// 杩欓噷搴旇鏍规嵁鏂规鍐呭璁剧疆鏌ヨ鏉′欢
// 鐢变簬鏂规鏁版嵁缁撴瀯澶嶆潅锛岃繖閲屽彧鍋氱畝鍗曟紨绀�
this.$modal.msgSuccess(`宸插簲鐢ㄦ柟妗堬細${row.鏂规鍚嶇О}`);
@@ -1595,7 +1205,7 @@
async deleteFilterScheme(row) {
try {
await this.$modal.confirm(`纭瑕佸垹闄ゆ柟妗�"${row.鏂规鍚嶇О}"鍚楋紵`);
-
+
const res = await axios.post(`${this.$baseUrl}/Xt_FastICScheme/delete`, {
HInterID: row.hmainid,
});
--
Gitblit v1.9.1