From 373a695602d097ebfeab50ed14dc0bbf96c691a1 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 27 一月 2026 10:56:26 +0800
Subject: [PATCH] 驾驶员修复
---
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue | 131 ++++++++++++++++---------------------------
1 files changed, 49 insertions(+), 82 deletions(-)
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
index 897f16c..4807b1e 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
@@ -1,5 +1,5 @@
<template>
- <div style="padding: 10px;">
+ <div style="padding: 10px; position: relative;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="78px" class="searchBox">
<el-form-item label="寮�濮嬫棩鏈�" style="margin-left: 100px;">
<el-date-picker v-model="sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
@@ -18,9 +18,7 @@
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
<el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="鍗曟嵁鍙�" prop="HBillno2">
- <el-input v-model="queryParams.HBillno2" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
- </el-form-item>
+
<el-form-item label-width="78px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery"> 鎼� 绱�</el-button>
<el-button icon="el-icon-circle-close" @click="resetQuery">閲� 缃�</el-button>
@@ -32,24 +30,7 @@
<el-form-item label="閮ㄩ棬" prop="HDeptID">
<el-input v-model="queryParams.HDeptID" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="鐗╂枡浠ｇ爜" prop="MaterialCode">
- <el-input v-model="queryParams.MaterialCode" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="鐗╂枡鍚嶇О" prop="MaterialName">
- <el-input v-model="queryParams.MaterialName" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="瑙勬牸鍨嬪彿" prop="SpecificationModel">
- <el-input v-model="queryParams.SpecificationModel" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="婧愬崟鍗曞彿" prop="HSourceBillNo">
- <el-input v-model="queryParams.HSourceBillNo" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="浠撳簱" prop="Warehouse">
- <el-input v-model="queryParams.Warehouse" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="鍒跺崟浜�" prop="Hmaker">
- <el-input v-model="queryParams.Hmaker" placeholder="璇疯緭鍏�" @keyup.enter.native="handleQuery" />
- </el-form-item>
+
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
<el-row>
@@ -182,19 +163,19 @@
</el-table-column>
</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" />
+ <RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫 -->
- <el-dialog title="缂栬緫璋冩嫧鐢宠鍗�" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
- <edit :OperationType=OperationType :linterid=this.rowForm.hmainid :HSouceBillType=this.rowForm.HSourceBillType
- :copyType="copyType" @editClose="editClose" v-if="editShow" />
+ <el-dialog title="缂栬緫" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox" @close="close">
+ <edit :OperationType=OperationType :linterid=this.rowForm.HInterID||this.rowForm.hmainid
+ :HSouceBillType=this.rowForm.HSourceBillType :copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
<el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
- <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName'
- :HModName='HModName' @rowEditClose="rowSetClose" v-if="printListShow" />
+ <PrintList :linterid=this.rowForm.hmainid :MyMsg=this.rowForm.hmainid :Type='HModName' :HModName='HModName'
+ @rowEditClose="rowSetClose" v-if="printListShow" />
<!-- <div>111</div> -->
</el-dialog>
</div>
@@ -204,16 +185,19 @@
<script>
import axios from 'axios'
import RowSettings from '@/views/component/rowSettings'
-import Edit from '@/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue'
+import Edit from '@/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue'
import PrintList from '@/views/component/printList'
import moment from 'moment';
export default {
- name: 'Kf_MoveStockRequestBillList',
+ name: 'Cg_ContractTransportBillMainList',
components: { RowSettings, Edit, PrintList },
+ props: {
+ openPage: { type: String, },
+ },
data() {
return {
- HModName: "Kf_MoveStockRequestBillList",
+ HModName: "Cg_ContractTransportBillMainList",
activeSeach: '',
editShow: false,
openEdit: false,
@@ -270,15 +254,13 @@
// 鏌ヨ鍙傛暟
queryParams: {
HBillNo: '',
- HBillno2:'',
+ HBillno2: '',
HInitTimeCycle: 29,
- HDeptID:'',
- MaterialCode:'',
- MaterialName:'',
- SpecificationModel:'',
- HSourceBillNo:'',
- Warehouse:'',
- Hmaker:'',
+ HDeptID: '',
+
+ HSourceBillNo: '',
+ Warehouse: '',
+ Hmaker: '',
ColName1: '',
ColName2: '',
ColName: '',
@@ -317,8 +299,8 @@
methods: {
//閲嶆柊鍚屾
set_ResCnz(){
- axios.get(this.baseURL + "/Cg_POOrderBill/Resynchronize", {
- params: { "HBillNo": '', "HBillType": 1243 }
+ axios.get(this.$baseUrl + "/Cg_POOrderBill/Resynchronize", {
+ params: { "HBillNo": '', "HBillType": 1117 }
}).then(response => {
let result = response.data
if (result.count == 1) {
@@ -398,12 +380,10 @@
if (this.pageSize == 0) {
this.pageSize = 50
}
- // 閿�鍞嚭搴撳崟鍒楄〃
- axios.get(this.baseURL + '/Cg_ContractTransportBillListController/getList', {
+ axios.get(this.$baseUrl + '/Cg_ContractTransportBillListController/get%EF%BB%BFList', {
params: {
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
-
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
@@ -421,7 +401,7 @@
//鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
var patrn = new RegExp(/^h/i);
if (patrn.test(data1.list[key].ColmCols)) {
- this.titleData[key] = data1.list[key].ColmCols;
+ this.titleData[key] = data1.list[key].ColmCols;
}
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
@@ -448,20 +428,20 @@
},
DisPlay_HideColumn(HModName, user, option, dataOption) {
this.totalNameList = []
- axios.get(this.baseURL + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
+ axios.get(this.$baseUrl + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
params: {
"HModName": HModName,
"user": user,
},
- }).then(res => {
+ }).then(res => {
let data1 = res.data
- if (data1.data.length != 0) {
+ if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
var newCols = [[]];//瀵瑰簲鏁版嵁搴撳垪椤哄簭col
newCols[0].push(option.cols[0][0]);//鏀惧叆绗竴涓猚heckbox
dataCol = data1.data[0].HGridString.split(',');
//鍒楄缃垪鏁颁笌椤甸潰鍒楁暟鏄惁涓�鑷�
- if (dataCol.length == option.cols[0].length - 1) {
+ if (dataCol.length == option.cols[0].length - 1) {
//閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
for (var j = 0; j < option.cols[0].length - 1; j++) {
for (var i = 0; i < option.cols[0].length - 1; i++) {
@@ -589,6 +569,9 @@
this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
this.lastSelectedRowIndex = this.tableData.indexOf(row);
this.$refs.tableData.toggleRowSelection(row);
+ if (this.openPage) {
+ this.$emit('deptEmit', row, 16)
+ }
},
//閫変腑琛岄珮浜牱寮�
rowStyle({ row, rowIndex }) {
@@ -599,7 +582,11 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
this.OperationType = 3
- this.handleEdit()
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 6)
+ } else {
+ this.handleEdit()
+ }
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
@@ -687,26 +674,9 @@
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
if (this.queryParams.HDeptID) {
- this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDeptID + "%'";
+ this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDeptID + "%'";
}
- if (this.queryParams.MaterialCode) {
- this.sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.MaterialCode + "%'";
- }
- if (this.queryParams.MaterialName) {
- this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.MaterialName + "%'";
- }
- if (this.queryParams.SpecificationModel) {
- this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + this.queryParams.SpecificationModel + "%'";
- }
- if (this.queryParams.HSourceBillNo) {
- this.sWhere += " and 婧愬崟鍗曞彿 like '%" + this.queryParams.HSourceBillNo + "%'";
- }
- if (this.queryParams.Warehouse) {
- this.sWhere += " and 浠撳簱鍚嶇О like '%" + this.queryParams.Warehouse + "%'";
- }
- if (this.queryParams.Hmaker) {
- this.sWhere += " and 鍒跺崟浜� like '%" + this.queryParams.Hmaker + "%'";
- }
+ console.log("danjuhao1", this.queryParams.HBillNo)
this.getList()
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
@@ -715,13 +685,10 @@
this.queryParams = {
HBillNo: '',
HInitTimeCycle: 29,
- HDeptID:'',
- MaterialCode:'',
- MaterialName:'',
- SpecificationModel:'',
- HSourceBillNo:'',
- Warehouse:'',
- Hmaker:'',
+ HDeptID: '',
+ HSourceBillNo: '',
+
+ Hmaker: '',
ColName1: '',
ColName2: '',
ColName: '',
@@ -767,7 +734,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.baseURL + "/Kf_MoveStockRequestBill/DeltetKf_MoveStockRequestBill", {
+ axios.get(this.$baseUrl + "/Cg_ContractTransportBillListController/Delete%EF%BB%BFBill", {
params: { 'HInterID': this.rowForm.hmainid.toString() }
}).then(response => {
if (response.data.count == 1) {
@@ -785,7 +752,7 @@
set_CheckBill(num, form) {
var InterID = form.hmainid || form.HInterID
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.baseURL + "/Kf_MoveStockRequestBill/AuditKf_MoveStockRequestBill", {
+ axios.get(this.$baseUrl + "/Cg_ContractTransportBillEdit/AuditCg_ContractTransportBillEdit", {
params: { "HInterID": InterID, "Type": num, "user": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
@@ -814,7 +781,7 @@
} else if (this.rowForm.鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
} else {
- axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
+ axios.get(this.$baseUrl + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
params: { "HInterID": this.rowForm.hmainid }
}).then(response => {
var result = response.data
@@ -837,7 +804,7 @@
//#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
defaintOperationByCompanyName() {
var result = false;
- axios.get(this.baseURL + '/Xt_getInfo/getCompanyName').then(response => {
+ axios.get(this.$baseUrl + '/Xt_getInfo/getCompanyName').then(response => {
var data1 = response.data
if (data1.count == 1) {
if (data1.data == "姘村姟") {
--
Gitblit v1.9.1