From 9620ca5caed59bd206dce701a04a5a4e4cfb9dc5 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期二, 31 三月 2026 13:46:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
.env.development | 6
/dev/null | 1323 ------------------------------------------
src/views/component/printList/hBarPlanPrint.vue | 54
src/views/logistics/transportGPS/WL_YayBill.vue | 44
public/static/grf/出运单.grf | 375 ++++++++++++
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 34 +
src/views/component/printList/barcode.vue | 9
7 files changed, 466 insertions(+), 1,379 deletions(-)
diff --git a/.env.development b/.env.development
index 317b137..f6c8b8d 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/寮�鍙戠幆澧�
# VUE_APP_BASE_API = http://localhost:81/API/
-# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
+VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
# VUE_APP_BASE_API = 'http://localhost:8082/API/'
@@ -14,8 +14,8 @@
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 瀹佹尝 鍥涚淮灏�
-VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
-VUE_APP_BASE_API = http://220.189.218.155:9010/API/
+# VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
+# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
#鏉滆春
# VUE_APP_BASE_API = http://localhost:8082/API/
# 鍐呯綉鍦板潃娴嬭瘯
diff --git a/RuoYi-Vue b/RuoYi-Vue
deleted file mode 160000
index 8a1cf9e..0000000
--- a/RuoYi-Vue
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8a1cf9ed55747229ce4149ddacf8596fa0995814
diff --git "a/public/static/grf/\345\207\272\350\277\220\345\215\225.grf" "b/public/static/grf/\345\207\272\350\277\220\345\215\225.grf"
new file mode 100644
index 0000000..bdbd86e
--- /dev/null
+++ "b/public/static/grf/\345\207\272\350\277\220\345\215\225.grf"
@@ -0,0 +1,375 @@
+锘縶
+ "Version":"6.8.2.2",
+ "Title":"1a.绠�鍗曡〃鏍�",
+ "Author":"閿愭氮鎶ヨ〃杞欢",
+ "Description":"婕旂ず涓�涓渶鍩烘湰鐨勫垪琛ㄦ姤琛ㄣ��",
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Weight":400,
+ "Charset":134
+ },
+ "Printer":{
+ "TopMargin":1.5,
+ "BottomMargin":1.5
+ },
+ "DetailGrid":{
+ "CenterView":true,
+ "PrintAdaptMethod":"ResizeToFit",
+ "Recordset":{
+ "Field":[
+ {
+ "Name":"鍗曟嵁鍙�"
+ },
+ {
+ "Name":"鐗╂枡浠ｇ爜"
+ },
+ {
+ "Name":"鐗╂枡鍚嶇О"
+ },
+ {
+ "Name":"鐗╂枡鏁伴噺",
+ "DBFieldName":"鏁伴噺"
+ },
+ {
+ "Name":"濮嬪彂鍦�"
+ },
+ {
+ "Name":"鏃ユ湡",
+ "Type":"DateTime",
+ "Format":"yyyy//MM//mm"
+ },
+ {
+ "Name":"鐩殑鍦�"
+ },
+ {
+ "Name":"杩愯緭绫诲瀷"
+ },
+ {
+ "Name":"鍙告満"
+ },
+ {
+ "Name":"杞﹀瀷"
+ },
+ {
+ "Name":"杞︾墝鍙�"
+ },
+ {
+ "Name":"瀹㈡埛"
+ },
+ {
+ "Name":"鎻愯揣鍦板潃"
+ },
+ {
+ "Name":"鍒拌揣鍦板潃"
+ },
+ {
+ "Name":"鎵胯繍鍟�"
+ }
+ ]
+ },
+ "Column":[
+ {
+ "Name":"鍗曟嵁鍙�",
+ "Width":2.77813
+ },
+ {
+ "Name":"鐗╂枡浠ｇ爜",
+ "Width":2.80458
+ },
+ {
+ "Name":"鐗╂枡鍚嶇О",
+ "Width":2.61938
+ },
+ {
+ "Name":"瑙勬牸鍨嬪彿",
+ "Width":4.84188
+ },
+ {
+ "Name":"Column1",
+ "Width":3.96875
+ },
+ {
+ "Name":"Column2",
+ "Width":2.77813
+ },
+ {
+ "Name":"Column3",
+ "Width":2.77813
+ }
+ ],
+ "ColumnContent":{
+ "Height":1.00542,
+ "ColumnContentCell":[
+ {
+ "Column":"鍗曟嵁鍙�",
+ "TextAlign":"MiddleCenter",
+ "DataField":"杩愯緭绫诲瀷"
+ },
+ {
+ "Column":"鐗╂枡浠ｇ爜",
+ "TextAlign":"MiddleCenter",
+ "DataField":"鐗╂枡浠ｇ爜"
+ },
+ {
+ "Column":"鐗╂枡鍚嶇О",
+ "TextAlign":"MiddleCenter",
+ "DataField":"鐗╂枡鍚嶇О"
+ },
+ {
+ "Column":"瑙勬牸鍨嬪彿",
+ "TextAlign":"MiddleCenter",
+ "DataField":"鐗╂枡鏁伴噺"
+ },
+ {
+ "Column":"Column1",
+ "DataField":"瀹㈡埛"
+ },
+ {
+ "Column":"Column2",
+ "DataField":"鎻愯揣鍦板潃"
+ },
+ {
+ "Column":"Column3",
+ "DataField":"鍒拌揣鍦板潃"
+ }
+ ]
+ },
+ "ColumnTitle":{
+ "BackColor":"C0C0C0",
+ "Height":0.608542,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":90000,
+ "Bold":true,
+ "Charset":134
+ },
+ "RepeatStyle":"OnPage",
+ "ColumnTitleCell":[
+ {
+ "GroupTitle":false,
+ "Column":"鍗曟嵁鍙�",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter",
+ "Text":"杩愯緭绫诲瀷"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"鐗╂枡浠ｇ爜",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter",
+ "Text":"鐗╂枡浠ｇ爜"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"鐗╂枡鍚嶇О",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter",
+ "Text":"鐗╂枡鍚嶇О"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"瑙勬牸鍨嬪彿",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter",
+ "Text":"鐗╂枡鏁伴噺"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column1",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter",
+ "Text":"瀹㈡埛"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column2",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter",
+ "Text":"鎻愯揣鍦板潃"
+ },
+ {
+ "GroupTitle":false,
+ "Column":"Column3",
+ "BackColor":"FFFFFF",
+ "TextAlign":"MiddleCenter",
+ "Text":"鍒拌揣鍦板潃"
+ }
+ ]
+ }
+ },
+ "ReportHeader":[
+ {
+ "Height":2.98979,
+ "Control":[
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox1",
+ "Center":"Horizontal",
+ "Left":6.29708,
+ "Top":0.79375,
+ "Width":3.41313,
+ "Height":0.582083,
+ "Font":{
+ "Name":"瀹嬩綋",
+ "Size":150000,
+ "Bold":true,
+ "Charset":134
+ },
+ "TextAlign":"MiddleCenter",
+ "Text":"鍑鸿繍鍗�"
+ },
+ {
+ "Type":"MemoBox",
+ "Name":"MemoBox1",
+ "Top":2.40771,
+ "Width":2.19604,
+ "Height":0.582083,
+ "Text":"鍙戣揣閫氱煡鍗�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox1",
+ "Left":2.40771,
+ "Top":2.40771,
+ "Width":2.19604,
+ "Height":0.582083,
+ "DataField":"鍗曟嵁鍙�"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox2",
+ "Left":3.99521,
+ "Top":2.40771,
+ "Width":2.61938,
+ "Height":0.582083,
+ "Text":"濮嬪彂鍦�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox2",
+ "Left":5.60917,
+ "Top":2.40771,
+ "Width":2.80458,
+ "Height":0.582083,
+ "DataField":"濮嬪彂鍦�"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox3",
+ "Left":11.0067,
+ "Top":0.79375,
+ "Width":1.79917,
+ "Height":0.582083,
+ "Text":"鏃ユ湡"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox3",
+ "Left":12.409,
+ "Top":0.79375,
+ "Width":2.01083,
+ "Height":0.582083,
+ "DataField":"鏃ユ湡"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox4",
+ "Left":8.20208,
+ "Top":2.40771,
+ "Width":2.19604,
+ "Height":0.582083,
+ "Text":"鐩殑鍦�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox4",
+ "Left":10.2129,
+ "Top":2.40771,
+ "Width":2.59292,
+ "Height":0.608542,
+ "DataField":"鐩殑鍦�"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox6",
+ "Left":12.409,
+ "Top":2.40771,
+ "Width":1.5875,
+ "Height":0.608542,
+ "Text":"鎵胯繍鍟�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox6",
+ "Left":13.9965,
+ "Top":2.40771,
+ "Width":2.01083,
+ "Height":0.582083,
+ "DataField":"鎵胯繍鍟�"
+ },
+ {
+ "Type":"Line",
+ "Name":"Line1",
+ "Left":3.99521,
+ "Top":1.5875,
+ "Width":6.61458
+ }
+ ]
+ }
+ ],
+ "ReportFooter":[
+ {
+ "Name":"ReportFooter1",
+ "Control":[
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox5",
+ "Width":2.59292,
+ "Height":0.396875,
+ "Text":"鍙告満"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox5",
+ "Left":2.59292,
+ "Width":2.4,
+ "Height":0.396875,
+ "DataField":"鍙告満"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox7",
+ "Left":5.00063,
+ "Width":2.19604,
+ "Height":0.396875,
+ "Text":"杞﹀瀷"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox7",
+ "Left":6.40292,
+ "Width":3.20146,
+ "Height":0.396875,
+ "DataField":"杞﹀瀷"
+ },
+ {
+ "Type":"StaticBox",
+ "Name":"StaticBox8",
+ "Left":8.59896,
+ "Width":2.01083,
+ "Height":0.396875,
+ "Text":"杞︾墝鍙�"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox8",
+ "Left":10.6098,
+ "Width":1.98438,
+ "Height":0.396875,
+ "DataField":"杞︾墝鍙�"
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/src/views/component/printList/barcode.vue b/src/views/component/printList/barcode.vue
index 921c0cf..683c8c4 100644
--- a/src/views/component/printList/barcode.vue
+++ b/src/views/component/printList/barcode.vue
@@ -58,6 +58,7 @@
return datajson;
},
async getPrintData() {
+ console.log(this.$route.query.Type)
// 鍦ㄥぇ鎵归噺鎵撳嵃鐨勬椂鍊� url闀垮害鍙兘瓒単et鍏佽鐨勯暱搴� 鍚庣闇�鎸夐渶姹� 鏀规垚POST璇锋眰
let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp);
let sql = "";
@@ -84,6 +85,12 @@
let condition = decodeURI(this.handleMessage.linterid.toString());
condition = condition.split(',').map(e => `'${e}'`).join(',')
sql = `exec h_p_GetSPBarCode_Swell N'${condition}'`;
+ } else if (this.$route.query.Type == "WL_YayBill") {
+ sql = "select * from h_v_WL_YayBilllist where hmainid in(" +
+ this.handleMessage.linterid.toString() +
+ ") order by hmainid desc";
+ console.log(sql)
+
}
try{
let res = await axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
@@ -95,6 +102,8 @@
},
});
// 灏� 娓叉煋鏁版嵁 鍜� 妯℃澘鍔犺浇鍒版湰鍦�
+ console.log(res)
+
let result = res.data;
this.json_data.recordset = result.data;
this.grfPath = "./static/grf/" + OpenTmp + ".grf";
diff --git a/src/views/component/printList/hBarPlanPrint.vue b/src/views/component/printList/hBarPlanPrint.vue
index 0683433..fd5c52e 100644
--- a/src/views/component/printList/hBarPlanPrint.vue
+++ b/src/views/component/printList/hBarPlanPrint.vue
@@ -39,6 +39,7 @@
return datajson;
},
ws_both_from_object() {
+ console.log(this.$route.query.Type)
let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp);
let sql = "";
if (this.$route.query.Type == "Kf_SellOutBillList") {
@@ -71,12 +72,14 @@
) AS t
GROUP BY CEILING(CAST(t.row_num AS FLOAT) / 2)
ORDER BY orderid;`;
- } else if (this.$route.query.Type == "Cg_ContractTransportBillMainList") {
- sql = "exec h_p_Cg_ContractTransportBillMainList " +
- this.handleMessage.linterid.toString();
+ } else if (this.$route.query.Type == "WL_YayBill") {
+
+ sql = "select * from h_v_WL_YayBilllist where hmainid in(" +
+ this.handleMessage.linterid.toString() +
+ ") order by hmainid desc";
}
- axios
- .get(this.$baseUrl + "/CommonModel/searchMethod", {
+ this.$nextTick(() => {
+ axios.get(this.$baseUrl + "/CommonModel/searchMethod", {
params: {
sql: sql,
user: sessionStorage["HUserName"],
@@ -84,25 +87,28 @@
// , "HSubID": data[i].hsubid
},
})
- .then((response) => {
- let result = response.data;
- this.json_data.recordset = result.data;
- //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
- var args = {
- type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
- // report: this.json_report, //report: JSON.stringify(json_report),
- report: urlAddRandomNo("./static/grf/" + OpenTmp + ".grf"),
- data: this.json_data, //data: JSON.stringify(json_data)
- };
- console.log(args, this.json_data);
- webapp_ws_ajax_run(args);
- // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
- // reportViewer.start();
- })
- .catch((error) => {
- console.log(22222, error);
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
+ .then((response) => {
+ console.log(111, OpenTmp, response)
+ let result = response.data;
+ this.json_data.recordset = result.data;
+ //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
+ var args = {
+ type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
+ // report: this.json_report, //report: JSON.stringify(json_report),
+ report: urlAddRandomNo("./static/grf/" + OpenTmp + ".grf"),
+ data: this.json_data, //data: JSON.stringify(json_data)
+ };
+ console.log(args, this.json_data);
+ webapp_ws_ajax_run(args);
+ // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
+ // reportViewer.start();
+ })
+ .catch((error) => {
+ console.log(22222, error);
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ })
+
},
},
};
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 49297eb..c17e08d 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -194,6 +194,25 @@
</el-col>
</el-row>
</div>
+ <div class="form-group">
+ <el-form-item label="闄勪欢" prop="fujian">
+ <el-upload
+ class="upload-demo"
+ ref="upload"
+ action=""
+ :on-preview="handleFilePreview"
+ :on-remove="handleFileRemove"
+ :on-change="handleFileChange"
+ :file-list="fileList"
+ :auto-upload="false"
+ :limit="10"
+ :on-exceed="handleExceed"
+ accept=".jpg,.png,.jpeg,.pdf,.doc,.docx,.xls,.xlsx,.zip,.rar">
+ <el-button size="small" type="primary">鐐瑰嚮涓婁紶</el-button>
+ <div slot="tip" class="el-upload__tip">鏀寔涓婁紶jpg/png/jpeg/pdf/doc/docx/xls/xlsx/zip/rar鏍煎紡鏂囦欢锛屾渶澶�10涓�</div>
+ </el-upload>
+ </el-form-item>
+ </div>
</el-tab-pane>
<el-tab-pane label="鎵胯繍鍟嗕俊鎭�" name="second">
<div class="form-group">
@@ -2015,6 +2034,21 @@
handleFileRemove(file, fileList) {
this.uploadFiles = fileList;
},
+ // 鏂囦欢棰勮
+ handleFilePreview(file) {
+ if (file.url) {
+ window.open(file.url, '_blank');
+ } else if (file.raw) {
+ const url = URL.createObjectURL(file.raw);
+ window.open(url, '_blank');
+ } else {
+ this.$message.warning('鏃犳硶棰勮璇ユ枃浠�');
+ }
+ },
+ // 鏂囦欢瓒呭嚭闄愬埗鏃剁殑澶勭悊
+ handleExceed(files, fileList) {
+ this.$message.warning(`褰撳墠闄愬埗閫夋嫨 10 涓枃浠讹紝鏈閫夋嫨浜� ${files.length} 涓枃浠讹紝鍏遍�夋嫨浜� ${files.length + fileList.length} 涓枃浠禶);
+ },
flieUpload(row) {
// 鍒涘缓FormData瀵硅薄
const formData = new FormData();
diff --git a/src/views/logistics/transportGPS/WL_YayBill copy.vue b/src/views/logistics/transportGPS/WL_YayBill copy.vue
deleted file mode 100644
index 4d75c68..0000000
--- a/src/views/logistics/transportGPS/WL_YayBill copy.vue
+++ /dev/null
@@ -1,1323 +0,0 @@
-<template>
- <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="queryParams.sTime" type="date" placeholder="寮�濮嬫棩鏈�" style="width: 150px;">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="缁撴潫鏃ユ湡">
- <el-date-picker v-model="queryParams.eTime" type="date" placeholder="缁撴潫鏃ユ湡" style="width: 150px;">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鏃ユ湡闂撮殧">
- <el-select v-model="queryParams.HInitTimeCycle" placeholder="璇烽�夋嫨" @change="riqiChange"
- style="width: 150px;">
- <el-option v-for="(item, index) in rqsgList" :key="index" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery"
- style="width: 150px;" />
- </el-form-item>
- <el-form-item label="杞︾墝鍙�" prop="HPlateNumber">
- <el-input v-model="queryParams.HPlateNumber" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keyup.enter.native="handleQuery"
- style="width: 120px;" />
- </el-form-item>
-
- <el-form-item label="缁勭粐" prop="HOrgID">
- <el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨缁勭粐">
- <el-option v-for="(item, index) in organizationList" :key="index" :label="item.Name"
- :value="item.ID">
- </el-option>
- </el-select>
- </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>
- </el-form-item>
- <el-collapse v-model="activeSeach">
- <el-collapse-item title="鏇村" name="1">
- <el-card class="box-card">
- <el-form-item label="渚涘簲鍟�" prop="HSupName">
- <el-input v-model="queryParams.HSupName" placeholder="璇疯緭鍏ヤ緵搴斿晢鍚嶇О"
- @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="鐗╂枡浠ｇ爜" prop="HMaterNumber">
- <el-input v-model="queryParams.HMaterNumber" placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�"
- @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="鐗╂枡鍚嶇О" prop="HMaterName">
- <el-input v-model="queryParams.HMaterName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
- @keyup.enter.native="handleQuery" />
- </el-form-item>
- <div slot="header" class="clearfix"><span>杩囨护</span></div>
- <div>
- <el-row>
- <el-form-item label-width="0">
- <el-row>
- <el-col :span="7">
- <el-select v-model="queryParams.ColName1" placeholder="璇烽�夋嫨"
- @change="riqiChange">
- <span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field"
- v-if="!item.hide"></el-option>
- </span>
- </el-select>
- </el-col>
- <el-col :span="6" style="padding: 0 10px;">
- <el-select v-model="queryParams.Comparator1" placeholder="璇烽�夋嫨"
- @change="riqiChange">
- <el-option v-for="(item, index) in comparatorList" :key="index"
- :label="item.label" :value="item.value"></el-option>
- </el-select>
- </el-col>
- <el-col :span="11">
- <el-input v-model="queryParams.ColContent1" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" />
- </el-col>
- </el-row>
- </el-form-item>
- </el-row>
- <el-row>
- <el-form-item label-width="0">
- <el-row>
- <el-col :span="7">
- <el-select v-model="queryParams.ColName2" placeholder="璇烽�夋嫨"
- @change="riqiChange">
- <span v-for="(item, index) in btList" :key="index">
- <el-option :label="item.field" :value="item.field"
- v-if="!item.hide"></el-option>
- </span>
- </el-select>
- </el-col>
- <el-col :span="6" style="padding: 0 10px;">
- <el-select v-model="queryParams.Comparator2" placeholder="璇烽�夋嫨"
- @change="riqiChange">
- <el-option v-for="(item, index) in comparatorList" :key="index"
- :label="item.label" :value="item.value"></el-option>
- </el-select>
- </el-col>
- <el-col :span="11">
- <el-input v-model="queryParams.ColContent2" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" />
- </el-col>
- </el-row>
- </el-form-item>
- </el-row>
- <el-form-item label-width="0">
- <el-row>
- <el-col :span="7">
- <el-select v-model="queryParams.ColName" placeholder="璇烽�夋嫨" @change="riqiChange">
- <el-option v-for="(item, index) in btList" :key="index" :label="item.field"
- :value="item.field"></el-option>
- </el-select>
- </el-col>
- <el-col :span="6" style="padding: 0 10px;">
- <el-select v-model="queryParams.Comparator" placeholder="璇烽�夋嫨"
- @change="riqiChange">
- <el-option v-for="(item, index) in comparatorList" :key="index"
- :label="item.label" :value="item.value"></el-option>
- </el-select>
- </el-col>
- <el-col :span="11">
- <el-input v-model="queryParams.ColContent" placeholder="璇疯緭鍏�" clearable
- @keyup.enter.native="handleQuery" />
- </el-col>
- </el-row>
- </el-form-item>
- </div>
- </el-card>
- </el-collapse-item>
- </el-collapse>
- </el-form>
- <el-row :gutter="10" class="mb8" style="margin-top: 10px;">
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit(OperationType = 1)"
- id="btn-Add">鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single"
- @click="handleEdit(row = rowForm, OperationType = 3, copyType = 0)">缂栬緫</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
- @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">澶嶅埗</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">鍒犻櫎
- </el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(0, form = rowForm)">瀹℃牳</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CheckBill(1, form = rowForm)">鍙嶅鏍�</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
- @click="handleVolume(rowForm)">缁存姢闆跺崟鍗犵敤浣撶Н</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
- @click="set_ConfirmBill">渚涘簲鍟嗙‘璁�</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="hanleCarOrDriver(form = rowForm)">鍒嗛厤杞﹁締鍜屽徃鏈�</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"
- @click="openDataDialog(15, form = rowForm)">鍒嗛厤鍙告満</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
- @click="set_ConfirmOtherBill(1)">鍒板巶纭</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
- @click="set_ConfirmOtherBill(2)">鎻愯揣纭</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
- @click="set_ConfirmOtherBill(3)">鍑哄巶杩愯緭纭</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
- @click="set_ConfirmOtherBill(4)">鍒拌揣绛炬敹纭</el-button>
- </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>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CloseBills(1, form = rowForm)">鍏抽棴</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_CloseBills(2, form = rowForm)">鍙嶅叧闂�</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_DropBill(1, form = rowForm)">浣滃簾</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
- @click="set_DropBill(2, form = rowForm)">鍙嶄綔搴�</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-printer" size="mini" @click="get_PrintReport">鎵撳嵃</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport">瀵煎嚭</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button type="primary" icon="el-icon-date" size="mini" @click="handleRowHide">闅愯棌鍒楄缃�</el-button>
- </el-col>
- </el-row>
- <div class="tableBox" v-loading="loading">
- <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
- @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick"
- :row-style="rowStyle" @cell-dblclick="handleDblclick" v-if="tableShow">
- <template v-for="(item, index) in btList">
- <el-table-column type="selection" width="55" align="center" :fixed="item.fixed"
- v-if="item.type == 'checkbox'" :key="index" />
- <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width"
- :key="item.id" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
- show-overflow-tooltip :fixed="item.fixed">
- <template slot-scope="{row, column }">
- <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
- <div :style="item.style">
- <span v-if="column.property.includes('鏃ユ湡')">{{ parseTime(row[column.property],
- '{y}-{m}-{d}') }}</span>
- <el-button type="text" @click="handleEdit(row, OperationType = 3)"
- v-else-if="column.property == '鍗曟嵁鍙�'">{{
- row.鍗曟嵁鍙�
- }}</el-button>
- <span v-else>{{ row[column.label] }}</span>
- </div>
- </template>
- </el-table-column>
- </template>
- </el-table>
- <!-- 璁板綍鏁般�侀〉鏁般�佸綋鍓嶉〉 -->
- <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize"
- @pagination="handleQuery" />
- <!-- 鍒楄缃� -->
- <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="缂栬緫" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
- @close="close">
- <Edit :OperationType=OperationType :linterid=this.rowForm.HInterID
- :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.HInterID :MyMsg=this.rowForm.HInterID :Type='HBillType'
- :HModName="HModName" @rowEditClose="rowSetClose" v-if="printListShow" />
- <!-- <div>111</div> -->
- </el-dialog>
-
- <el-dialog title="缁存姢闆跺崟鍗犵敤浣撶Н" :visible.sync="openVolume" width="580px" append-to-body>
- <el-form ref="form" :model="formVolume" :rules="rulesVolume" label-width="130px">
- <el-form-item label="鍗曟嵁鍙�">
- <el-input v-model="formVolume.鍗曟嵁鍙�" placeholder="璇疯緭鍏ュ崟鎹彿" disabled />
- </el-form-item>
- <el-form-item label="闆跺崟鍗犵敤浣撶Н">
- <el-input-number v-model="formVolume.currentVolume" placeholder="璇疯緭鍏ラ浂鍗曞崰鐢ㄤ綋绉�" />
- </el-form-item>
- </el-form>
- <div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="set_HScatteredVolumeList">纭� 瀹�</el-button>
- <el-button @click="cancelVolume">鍙� 娑�</el-button>
- </div>
- </el-dialog>
- <!-- 鏉＄爜鏄庣粏 -->
- <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
- <!-- 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁� -->
- <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>
- <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>
-
-<script>
-import axios from 'axios'
-import moment from 'moment'; //鏃堕棿鏍煎紡鍖�
-import RowSettings from '@/views/component/rowSettings' //鍒楄缃粍浠�
-import PrintList from '@/views/component/printList' //鎵撳嵃缁勪欢
-import BarCodeDetail from '@/views/component/BarCodeDetail' //鏉＄爜鏄庣粏缁勪欢
-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, GyCar, GyDriver },
- data() {
- return {
- baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
-
- HModName: "Cg_ContractTransportBillMainList",
- HBillType: "Cg_ContractTransportBillMainList",
- OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
- copyType: 0, //澶嶅埗鏍囪銆傛墦寮�缂栬緫缁勪欢鏃讹紝鐢ㄤ簬鍖哄垎缂栬緫杩樻槸澶嶅埗
- HInterID: null,
- hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
-
- rqsgList: [ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鏁版嵁
- { label: '浠婂ぉ', value: 0 },
- { label: '杩戜袱澶�', value: 1 },
- { label: '杩戜笁澶�', value: 2 },
- { label: '杩戝洓澶�', value: 3 },
- { label: '杩戜簲澶�', value: 4 },
- { label: '杩戝叚澶�', value: 5 },
- { label: '杩戜竷澶�', value: 6 },
- { label: '杩�30澶�', value: 29 },
- { label: '杩戝崐骞�', value: 180 },
- { label: '杩戜竴骞�', value: 365 },
- ],
- organizationList: JSON.parse(sessionStorage.getItem('organizationList')), //缁勭粐鍒楄〃
- btList: [], //鍒楄〃琛ㄥご瀛楁鍒楄〃
- comparatorList: [ //杩愮畻鏍囪瘑涓嬫媺鍒楄〃
- { label: '=', value: '=' },
- { label: '>=', value: '>=' },
- { label: '>', value: '>' },
- { label: '<=', value: '<=' },
- { label: '<', value: '<' },
- { label: '<>', value: '<>' },
- { label: '鍖呭惈', value: '7' },
- { label: '宸﹀寘鍚�', value: '8' },
- { label: '鍙冲寘鍚�', value: '9' },
- { label: '涓嶅寘鍚�', value: '10' },
- ],
-
- dialogTitle: '', // 寮圭獥鏍囬
- title: "", // 寮瑰嚭灞傛爣棰�
- open: false, // 鏄惁鏄剧ず寮瑰嚭灞�
- loading: true, // 閬僵灞�
- rowList: [], // 閫変腑琛屾暟鎹泦鍚�
- activeSeach: '',
- // addBtnShow: false, //缂栬緫缁勪欢瀹瑰櫒鏄剧ず鏍囪
- editShow: false, //缂栬緫缁勪欢瀹瑰櫒鏄剧ず鏍囪
- openEdit: false, //缂栬緫缁勪欢鏄剧ず鏍囪
- pushShow: false,
- openPush: false,
- pushData: '',
- openPrintList: false, //鎵撳嵃缁勪欢瀹瑰櫒鏄剧ず鏍囪
- printListShow: false, //鎵撳嵃缁勪欢鏄剧ず鏍囪
- openBtnHide: false, //鎸夐挳缁勪欢瀹瑰櫒鏄剧ず鏍囪
- btnHideShow: false, //鎸夐挳缁勪欢鏄剧ず鏍囪
- openRowHide: false, //鍒楄缃粍浠舵樉绀烘爣璁�
- rowHideShow: false, //鍒楄缃粍浠跺鍣ㄦ樉绀烘爣璁�
- barCodeDetailShow: false, //鏉＄爜鏄庣粏缁勪欢瀹瑰櫒鏄剧ず鏍囪
- packStockDetailShow: false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
- openVolume: false, //缁存姢闆跺崟鍗犵敤浣撶Н寮圭獥鏍囪
- openData: false, //鏁版嵁寮圭獥
- dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
- gyCarShow: false, //杞﹁締鏁版嵁缁勪欢鏄剧ず鏍囪
- gyDriverShow: false, //鍙告満鏁版嵁缁勪欢鏄剧ず鏍囪
- deptform: {}, //寮圭獥閫変腑鏁版嵁
- // 鏌ヨ鍙傛暟
- sWhere: '', // 鎷兼帴杩囨护鏉′欢
- queryParams: { // form鏁版嵁
- HBillNo: '',
- HPlateNumber: '',
- HInitTimeCycle: 29,
- sTime: '',
- eTime: '',
- HOrgID: sessionStorage["OrganizationID"] - 0,
- HSupName: null,
- HMaterNumber: '',
- HMaterName: '',
- ColName1: '',
- ColName2: '',
- ColName: '',
- Comparator1: '',
- Comparator2: '',
- Comparator: '',
- ColContent1: '',
- ColContent2: '',
- ColContent: '',
- },
- page: 1, //page椤电储寮�
- pageSize: 0, //page椤甸潰璁板綍鏁�
- total: 0, //璁板綍鍚堣鏁�
- tableShow: true, // table鏄剧ず鏍囪
- totalNameList: [], // 闇�瑕佽缃悎璁¤鐨勫垪鏁扮粍
- tableData: [], // 鍒楄〃鏁版嵁銆傜敤浜巘able鐩戝惉浜嬩欢
- ids: [], // 閫変腑琛岀殑hmainid鏁扮粍
- single: true, // 褰撻�変腑鐨勮鏁颁笉涓�1鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
- multiple: true, // 褰撻�変腑鐨勮鏁颁负0鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
- lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
- lastSelectedRow: null, // 涓婁竴娆￠�変腑鐨勮
- selectedRow: null, // 褰撳墠閫変腑鐨勮
- rowForm: {}, // 褰撻�変腑鐨勫彧鏈変竴琛屾椂锛屾洿鏂版暟鎹负璇ラ�変腑鐨勮銆�
- formVolume: {}, // 缁存姢闆跺崟鍗犵敤浣撶Н琛ㄥ崟銆�
- rulesVolume: {}, // 缁存姢闆跺崟鍗犵敤浣撶Н琛ㄥ崟楠岃瘉銆�
- tyResList: [], // 鍒楄〃鏁版嵁锛岀敤浜庡鍑�
- titleData: ["HInterID", "HEntryID", "HBillStatus", "HMaterID", "HPreventErrMouldID", "HOrgID"], // 涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- btResList: [], // 鍒楄〃琛ㄥご鏁版嵁銆傜敤浜庡垪璁剧疆
- dataList: [], // option璁板綍銆傜敤浜庡綋option鏁版嵁鏃犳晥鏃讹紝鐢ㄤ簬鍒楄缃�
- };
- },
- created() {
- this.riqiChange()
- this.handleQuery();
- },
-
- methods: {
- //#region 璁剧疆琛ㄥご
- renderHeader(h, { column, $index }) {// 鏂板缓涓�涓� span
- let span = document.createElement(span)// 璁剧疆琛ㄥご鍚嶇О
- span.innerText = column.label
- //涓存椂鎻掑叆 document
- document.body.appendChild(span)// 閲嶇偣:鑾峰彇 span 鏈�灏忓搴︼紝璁剧疆褰撳墠鍒楋紝娉ㄦ剰杩欓噷鍔犱簡 20锛屽瓧娈佃緝澶氭椂column.minWidth=span.getBoundingClientRect().width + 50.//绉婚櫎 document 涓复鏃剁殑 span
- document.body.removeChild(span)
- return h(span, column.label)
- },
- //#endregion
-
- //#region 鐐瑰嚮琛�
- handleRowClick(row, column, event) {
- this.lastSelectedRow = this.selectedRow; // 璁板綍涓婁竴娆￠�変腑鐨勮
- this.selectedRow = row; // 璁板綍褰撳墠閫変腑鐨勮
- this.lastSelectedRowIndex = this.tableData.indexOf(row);
- this.$refs.tableData.toggleRowSelection(row);
- },
- //#endregion
-
- //#region 閫変腑琛岄珮浜牱寮�
- rowStyle({ row, rowIndex }) {
- if (this.ids.includes(row.HInterID)) {
- return { "background": "#ecf5ff" }
- }
- },
- //#endregion
-
- //#region 鍙屽嚮琛�
- handleDblclick(row, column, cell, event) {
- this.OperationType = 3
- this.handleEdit()
- },
- //#endregion
-
- //#region 澶氶�夋閫変腑鏁版嵁
- handleSelectionChange(selection) {
- // this.rowForm = {}
- this.rowList = selection
- this.ids = selection.map(item => item.HInterID)
- this.single = selection.length != 1
- this.multiple = !selection.length
- if (!this.single) {
- this.rowForm = selection[0]
- }
- },
- //#endregion
-
- //#region 鏍规嵁鏃ユ湡闂撮殧锛岃缃紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
- riqiChange() {
- const end = new Date();
- const start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * this.queryParams.HInitTimeCycle);
- const yyyyS = start.getFullYear();
- const mmS = String(start.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
- const ddS = String(start.getDate()).padStart(2, '0');
- const yyyyE = end.getFullYear();
- const mmE = String(end.getMonth() + 1).padStart(2, '0'); // 鏈堜唤鏄粠0寮�濮嬬殑
- const ddE = String(end.getDate()).padStart(2, '0');
- this.queryParams.sTime = yyyyS + '-' + mmS + '-' + ddS
- this.queryParams.eTime = yyyyE + '-' + mmE + '-' + ddE
- },
- //#endregion
-
- //#region 閲嶇疆
- resetQuery() {
- this.sWhere = ''
- this.queryParams = {
- HBillNo: '',
- HInitTimeCycle: 29,
- HSupName: null,
- HMaterNumber: '',
- HMaterName: '',
- ColName1: '',
- ColName2: '',
- ColName: '',
- Comparator1: '',
- Comparator2: '',
- Comparator: '',
- ColContent1: '',
- ColContent2: '',
- ColContent: '',
- }
- this.riqiChange()
- this.resetForm("queryForm")
- this.handleQuery()
- },
- //#endregion
- //#region 鏉冮檺鍒ゆ柇
- async set_ModCheck(ModRightNameCheck) {
- var Permission = false;
- const res = await axios.get(this.$baseUrl + '/LMES/getReportByModRightNameCheck', {
- params: {
- "ModRightNameCheck": ModRightNameCheck,
- "user": sessionStorage["HUserName"],
-
- },
- }).then(result => {
- if (result.data.count != 1) {
- Permission = true;
- this.sWhere = this.sWhere + " and 鎵胯繍鍟咺D =" + sessionStorage["HSupID"]
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
- //#region 蹇�熻繃婊�
- async handleQuery() {
- this.sWhere = ''
- await this.set_ModCheck("WLYayBill_SUPQuery")
- if (this.queryParams.ColName && this.queryParams.Comparator) {
- var com = "";
- switch (this.queryParams.Comparator) {
- case "7":
- com = "like'%" + this.queryParams.ColContent + "%'";
- break;
- case "8":
- com = "like'%" + this.queryParams.ColContent + "'";
- break;
- case "9":
- com = "like'" + this.queryParams.ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + this.queryParams.ColContent + "%'";
- break;
- default:
- com = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
- break;
- }
- this.sWhere += " and " + this.queryParams.ColName + " " + com;
- }
- if (this.queryParams.ColName1 && this.queryParams.Comparator1) {
- var com1 = "";
- switch (this.queryParams.Comparator1) {
- case "7":
- com1 = "like'%" + this.queryParams.ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + this.queryParams.ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + this.queryParams.ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + this.queryParams.ColContent1 + "%'";
- break;
- default:
- com1 = "" + this.queryParams.Comparator1 + "'" + this.queryParams.ColContent1 + "'";
- break;
- }
- this.sWhere += " and " + this.queryParams.ColName1 + " " + com1;
- }
- if (this.queryParams.ColName2 && this.queryParams.Comparator2) {
- var com2 = "";
- switch (this.queryParams.Comparator2) {
- case "7":
- com2 = "like'%" + this.queryParams.ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + this.queryParams.ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + this.queryParams.ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + this.queryParams.ColContent2 + "%'";
- break;
- default:
- com2 = "" + this.queryParams.Comparator + "'" + this.queryParams.ColContent + "'";
- break;
- }
- this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
- }
- if (this.queryParams.sTime) {
- this.queryParams.sTime = moment(this.queryParams.sTime).format('YYYY-MM-DD')
- this.queryParams.eTime = moment(this.queryParams.eTime).format('YYYY-MM-DD')
- this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.queryParams.sTime + "'" + " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.queryParams.eTime + "'";
- }
- if (this.queryParams.HBillNo) {
- this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
- }
- if (this.queryParams.HPlateNumber) {
- this.sWhere += " and 杞︾墝鍙� like '%" + this.queryParams.HPlateNumber + "%'";
- }
-
- // if (this.queryParams.HOrgID) {
- // this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
- // }
- console.log("swhere", this.sWhere)
- this.clearData()
- this.getList()
- },
- //#endregion
-
- //#region 鏌ヨ
- getList() {
- this.pageSize = 50
- if (this.pageSize == 0) {
- this.pageSize = 50
- }
- this.tableShow = false
- this.loading = true
- console.log("swhere", this.sWhere)
- // 鍒楄〃鏌ヨ
- axios.get(this.$baseUrl + '/WLYayBillController/GetListPage', {
- params: {
- "sWhere": this.sWhere,
- "user": sessionStorage["HUserName"],
- "page": this.page,
- "size": this.pageSize
- },
- }).then(response => {
- this.tyResList = response.data.data//鎬绘暟鎹�
- let data1 = response.data
- let option = []
- if (data1.code == 1) {
- this.btResList = data1.list //鍒楄〃琛ㄥご鏁版嵁
- this.total = data1.count;
- var data = [];//鍒楀瓧娈垫暟鎹�
- var col = [];
- var totalArray = [];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {//寰簭閬嶅巻鏁扮粍
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//浠庢瘡涓璞′腑鎻愬彇鏁版嵁
- }
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) {//閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
- if (this.titleData.indexOf(data[i].name) > -1) {//妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
- } else if (totalArray.indexOf(data[i].name) > -1 || (data[i].Type == "Decimal" || data[i].Type == "Int32")) { //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- }
- else {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
- }
- option.cols = [col]
- this.dataList = option
- option.data = data1.data;
- var result = data1.data;
- option.data = result;
- let HModName = this.HModName
- this.DisPlay_HideColumn(HModName, sessionStorage["HUserName"], option, this.dataList);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
-
- //#region 鍚堣琛屾暟鎹鐞�
- getSummaries(param) {
- const { columns, data } = param;
- const sums = [];
- columns.forEach((column, index) => {
- if (index === 0) {
- sums[index] = '鍚堣';
- return;
- }
- const values = data.map(item => Number(item[column.property]));
- if (this.totalNameList[index].totalRow) {
- if (!values.every(value => isNaN(value))) {
- sums[index] = values.reduce((prev, curr) => {
- const value = Number(curr);
- if (!isNaN(value)) {
- return prev + curr;
- } else {
- return prev;
- }
- }, 0)
-
- } else {
- sums[index] = '';
- }
- }
- }, 1000);
- return sums;
- },
- //#endregion
-
- //#endregion
-
- //#region 鏂板
- handleAddEdit() {
- this.rowForm.HInterID = 0
- this.editShow = true
- this.openEdit = true
- },
- //#endregion
-
- //#region 缂栬緫
- handleEdit(row) {
- this.rowForm = row
- this.editShow = true
- this.openEdit = true
- },
- editClose(val) {
- this.open = val
- this.editShow = false
- this.openEdit = val
- this.handleQuery()
- },
- //#endregion
-
- //#region 鍒犻櫎
- handleDelete() {
- this.$modal.confirm('纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠').then(() => {
- axios.get(this.$baseUrl + "/WLYayBillController/deleteBill", {
- params: { 'HItemID': this.rowForm.HInterID.toString(), 'user': sessionStorage["HUserName"] }
- }).then(response => {
- if (response.data.count == 1) {
- this.handleQuery()
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛")
- } else {
- this.$modal.msgError("閿欒:" + result.code + result.Message);
- }
- }).catch(error => {
- console.log(error)
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- }).catch(() => { })
- },
- //#endregion
-
- //#region 鎵胯繍鍟嗙‘璁�
- set_ConfirmBill() {
- var confirmMes = "";
- if (this.rowForm["鎵胯繍鍟嗙‘璁ゆ椂闂�"] != null) {
- confirmMes = "鏄惁鏇存柊鎵胯繍鍟嗙‘璁ゆ椂闂�?"
- } else {
- confirmMes = "鏄惁纭鎵胯繍鍟嗙‘璁ゆ椂闂�?"
-
- }
- this.$modal.confirm(confirmMes).then(() => {
- axios.get(this.$baseUrl + "/WLYayBillController/ConfrimBillNo", {
- params: { 'HInterID': this.rowForm.HInterID.toString(), "IsAudit": 0, 'CurUserName': sessionStorage["HUserName"] }
- }).then(response => {
- let result = response.data
- if (result.count == 1) {
- this.handleQuery()
- this.$modal.msgSuccess(result.Message)
- } else {
- this.$modal.msgError(result.code + result.Message);
- }
- }).catch(error => {
- console.log(error)
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- }).catch(() => { })
-
- },
- //#endregion
- //#region 鍏朵粬纭
- set_ConfirmOtherBill(nums) {
- var confirmMes = "";
- if (nums === 1) {
- confirmMes = "鏄惁纭鍒板巶?"
- }
- else if (nums === 2) {
- confirmMes = "鏄惁纭鎻愯揣?"
- }
- else if (nums === 3) {
- confirmMes = "鏄惁纭鍑哄巶杩愯緭?"
- }
- else if (nums === 4) {
- confirmMes = "鏄惁纭鍒拌揣绛炬敹?"
- } else {
- confirmMes = "鏄惁纭鎵胯繍鍟嗙‘璁ゆ椂闂�?"
- }
- this.$modal.confirm(confirmMes).then(() => {
- axios.get(this.$baseUrl + "/WLYayBillController/ConfrimOtherBillNo", {
- params: { 'HInterID': this.rowForm.HInterID.toString(), "IsAudit": nums, 'CurUserName': sessionStorage["HUserName"] }
- }).then(response => {
- let result = response.data
- if (result.count == 1) {
- this.handleQuery()
- this.$modal.msgSuccess(result.Message)
- } else {
- this.$modal.msgError(result.code + result.Message);
- }
- }).catch(error => {
- console.log(error)
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- }).catch(() => { })
- },
- //#endregion
- //#region 缁存姢闆跺崟鍗犵敤浣撶Н
- //#region 缁存姢闆跺崟鍗犵敤浣撶Н閲嶇疆
- resetVolume() {
- this.formVolume = {
- HInterID: 0,
- HEntryID0: 0,
- currentVolume: 0,
- 鍗曟嵁鍙�: ''
- }
- },
- //#endregion
- //#region 缁存姢闆跺崟鍗犵敤浣撶Н閲嶇疆
- handleVolume(form) {
- this.resetVolume()
- axios.get(this.$baseUrl + "/WLYayBillController/WL_YayBillDetail", {
- params: { 'HID': form.HInterID }
- }).then(response => {
- console.log(response.data.data.h_v_WL_YayBillEdit)
- // this.formVolume = response.data.data.h_v_WL_YayBillEdit[form.HEntryID-1]
- this.formVolume = form
- this.openVolume = true
- })
- },
- //#endregion
- //#region 涓嬫帹杩愬崟璐圭敤
- SelectPayWayBill() {
- this.editShow = true
- this.openEdit = true
- this.OperationType = 4
- },
- //鍏抽棴涓嬫帹椤甸潰
- pushClose(val) {
- this.open = val
- this.pushShow = false
- this.openPush = val
- this.clearData()
- this.getList()
- },
- //#endregion
- cancelVolume() {
- this.openVolume = false
- this.resetVolume()
- },
- //#region 缁存姢闆跺崟鍗犵敤浣撶Н鎻愪氦
- set_HScatteredVolumeList() {
- axios.get(this.$baseUrl + "/WLYayBillController/updateBillMEs", {
- params: {
- 'HInterID': this.formVolume.HInterID.toString(),
- "HEntryID": this.formVolume.HEntryID.toString(),
- "ScatteredVolume": this.formVolume.currentVolume,
- 'CurUserName': sessionStorage["HUserName"]
- }
- }).then(response => {
- let result = response.data
- if (result.count == 1) {
- this.handleQuery()
- this.openVolume = true
- this.$modal.msgSuccess(result.Message)
- } else {
- this.$modal.msgError(result.code + result.Message);
- }
- }).catch(error => {
- console.log(error)
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
- //#endregion
- //#region 瀹℃牳/鍙嶅鏍�
- set_CheckBill(num, form) {
- var InterID = form.hmainid || form.HInterID
- //閫昏緫瀹℃牳鏂规硶
- axios.get(this.$baseUrl + "/WLYayBillController/AuditWLYayBill", {
- params: { "HInterID": InterID, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
- }).then(response => {
- let result = response.data
- if (result.code == 1) {
- this.$modal.msgSuccess(result.Message);
- this.handleQuery();
- }
- else {
- this.$modal.msgError("閿欒:" + result.code + result.Message,);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
- //#region 鎵撳紑涓嬫帹缁勪欢寮圭獥
- 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[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
- //#region 鍏抽棴/鍙嶅叧闂�
- set_CloseBills(num) {
- var InterID = form.hmainid || form.HInterID
- //閫昏緫瀹℃牳鏂规硶
- axios.get(this.$baseUrl + "/Cg_ContractTransportBillEdit/CloseCg_ContractTransportBillEdit", {
- params: { "HInterID": InterID, "Type": num, "CurUserName": sessionStorage["HUserName"] }
- }).then(response => {
- let result = response.data
- if (result.code == 1) {
- this.$modal.msgSuccess(result.Message);
- this.handleQuery();
- }
- else {
- this.$modal.msgError("閿欒:" + result.code + result.Message,);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
- //#region 浣滃簾/鍙嶄綔搴�
- set_DropBill(num) {
- var InterID = form.hmainid || form.HInterID
- //閫昏緫瀹℃牳鏂规硶
- axios.get(this.$baseUrl + "/Cg_ContractTransportBillEdit/DropCg_ContractTransportBillEdit", {
- params: { "HInterID": InterID, "Type": num, "CurUserName": sessionStorage["HUserName"] }
- }).then(response => {
- let result = response.data
- if (result.code == 1) {
- this.$modal.msgSuccess(result.Message);
- this.handleQuery();
- }
- else {
- this.$modal.msgError("閿欒:" + result.code + result.Message,);
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
- //#region 鍒楄缃�
- handleRowHide() {
- this.rowHideShow = true
- this.openRowHide = true
- },
- rowSetClose(val) {
- this.rowHideShow = false
- this.tableShow = true
- this.openRowHide = val
- this.handleQuery()
- },
- DisPlay_HideColumn(HModName, user, option, dataOption) {
- this.totalNameList = []
- axios.get(this.$baseUrl + '/Xt_grdAlignment_WMES/grdAlignmentWMESList', {
- params: {
- "HModName": HModName,
- "user": user,
- },
- }).then(res => {
- let data1 = res.data
- 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) {
- //閬嶅巻瀵绘壘鍒楄缃搴斿垪鎸夐『搴忔彃鍏�
- for (var j = 0; j < option.cols[0].length - 1; j++) {
- for (var i = 0; i < option.cols[0].length - 1; i++) {
- var dataCols = dataCol[j].split('|');
- //閫夋嫨涓巇atacols鐩稿簲鍒楄繘琛屼慨鏀�
- if (option.cols[0][i + 1]["field"] == dataCols[5]) {
- //闅愯棌鍒�
- if (dataCols[1] == 1) {
- option.cols[0][i + 1]["hide"] = true;
- }
- //璁剧疆鍒楀
- if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
- }
- //璁剧疆鍐呭瀛椾綋澶у皬
- if (data1.data[0].HFontSize != 0) {
- option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
- } else {
- option.cols[0][i + 1]["style"] = "font-size:100%";
- }
- //鏄剧ず鍒�
- if (dataCols[1] == 0 && this.titleData.indexOf(option.cols[0][i + 1]["title"]) == -1) {
- option.cols[0][i + 1]["hide"] = false;
- }
- //缁熻鍒�
- if (dataCols[6] == 1) {
- option.cols[0][i + 1]["totalRow"] = true;
- } else {
- option.cols[0][i + 1]["totalRow"] = false;
- }
- //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
- switch (dataCols[2]) {
- case "L":
- option.cols[0][i + 1]["align"] = "left";
- break;
- case "M":
- option.cols[0][i + 1]["align"] = "center";
- break;
- case "R":
- option.cols[0][i + 1]["align"] = "right";
- break;
- }
- //璁剧疆琛ㄦ牸title灞炴�ф樉绀哄埆鍚�
- if (dataCols[4] != null && dataCols[4] != "") {
- option.cols[0][i + 1]["title"] = dataCols[4];
- }
- newCols[0].push(option.cols[0][i + 1]);
- break;
- }
- }
- }
- //閬嶅巻寰幆鍚庡垽鏂搴斿垪鏁版槸鍚︿竴鑷�
- if (dataCol.length == newCols[0].length - 1) {
- option.cols = newCols;
- //鍙栨秷鍐荤粨鍒�
- for (var i = 1; i < option.cols[0].length - 1; i++) {
- if (option.cols[0][i + 1]["fixed"] != null) {
- option.cols[0][i + 1]["fixed"] = null;
- }
- else {
- break;
- }
- }
- //鍐荤粨鍒�
- if (data1.data[0].HFixCols != 0) {
- for (var i = 0; i < data1.data[0].HFixCols; i++) {
- if (dataOption.cols[0].indexOf(option.cols[0][i + 1]["title"]) != -1) {
- data1.data[0].HFixCols += 1;
- }
-
- option.cols[0][i + 1]["fixed"] = "left";
- }
- }
- //璁剧疆鍒楁帓搴�
- for (var i = 1; i < option.cols[0].length; i++) {
- if (data1.data[0].HSortFlag == "鏄�") {
- option.cols[0][i]["sort"] = true;
- }
- else {
- option.cols[0][i]["sort"] = false;
- }
- }
- }
- }
- this.btList = option.cols[0]
- this.btList.map(item => {
- if (!item.hide) {
- this.totalNameList.push(item)
- }
- })
- if (data1.data[0].HPageSize == 0) {
- this.pageSize = 50
- } else {
- this.pageSize = data1.data[0].HPageSize
- }
- this.tableData = option.data
- this.tableShow = true
- this.loading = false
- } else {
- this.btList = dataOption.cols[0]
- this.btList.map(item => {
- if (!item.hide) {
- this.totalNameList.push(item)
- }
- })
- this.tableData = dataOption.data
- this.tableShow = true
- this.loading = false
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
- //#endregion
-
- //#region 鎸夐挳璁剧疆
- handleBtnHide() {
- this.btnHideShow = true
- this.openBtnHide = true
- },
- //#endregion
-
- //#region 瀵煎嚭
- handleExport() {
- const ws = this.$XLSX.utils.json_to_sheet(this.tyResList); // 灏嗘暟鎹浆鎹负宸ヤ綔琛�
- const wb = this.$XLSX.utils.book_new(); // 鍒涘缓涓�涓柊鐨勫伐浣滅翱
- this.$XLSX.utils.book_append_sheet(wb, ws, "Sheet1"); // 灏嗗伐浣滆〃娣诲姞鍒板伐浣滅翱涓紝骞跺懡鍚嶄负"Sheet1"
- this.$XLSX.writeFile(wb, `Cg_ContractTransportBillMainList_${new Date().getTime()}.xlsx`); // 瀵煎嚭鏂囦欢
- },
- //#endregion
-
- //#region 鎵撳嵃
- get_PrintReport() {
- if (this.ids.length != 1) {
- this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
- } else if (this.rowForm.鍗曟嵁鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
- this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
- } else {
- axios.get(this.$baseUrl + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
- params: { "HInterID": this.rowForm.HInterID }
- }).then(response => {
- var result = response.data
- if (result.count == 1) {
- this.printListShow = true
- this.openPrintList = true
- // this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
- } else {
- this.$modal.msgError(result.code + result.Message)
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
-
-
- }
- // var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
- },
- //#endregion
-
- //#region 鏉＄爜鏄庣粏
- get_BarCodeDetail() {
- // if (this.selectedRow.length !== 1) {
- // this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
- // return
- // }
- this.barCodeDetailShow = true
- this.$nextTick(() => {
- this.$refs.barcodeDetail.open(this.rowForm)
- })
- },
- //#endregion
-
- //#region 鍖呰瀹瑰櫒鍑哄叆搴撴槑缁�
- get_PackStockDetail() {
- // if (this.selectedRow.length !== 1) {
- // this.$message.warning('璇烽�夋嫨涓�琛屾暟鎹煡鐪嬫潯鐮佹槑缁嗭紒')
- // return
- // }
- this.packStockDetailShow = true
- this.$nextTick(() => {
- this.$refs.packStockDetail.open(this.rowForm)
- })
- },
- //#endregion
-
- //#region 閫�鍑�
- close() {
- // this.reset()
- this.tableShow = true
- this.openEdit = false
- this.editShow = false
- this.pushShow = false
- this.openPush = false
- this.handleQuery()
- },
- //#endregion
-
- //#region 鑾峰彇鍏徃鍚嶏紝鏍规嵁鍏徃杩涜瀹氬埗鍖栧紑鍙�
- defaintOperationByCompanyName() {
- var result = false;
- axios.get(this.$baseUrl + '/Xt_getInfo/getCompanyName').then(response => {
- var data1 = response.data
- if (data1.count == 1) {
- if (data1.data == "姘村姟") {
- result = true;
- }
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- 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 {
- console.log(deptRow)
- 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("鑾峰彇婧愬崟鏁版嵁鏃跺彂鐢熼敊璇紝璇风◢鍚庨噸璇�!");
- }
- },
- //#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
- //娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
- clearData() {
- this.ids = []
- this.multiple = true
- this.single = true
- this.OperationType = 0
- this.copyType = 0
- },
-
- }
-};
-</script>
-<style>
-.xsckdBox .el-date-editor.el-input {
- width: 100%;
-}
-</style>
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 4a67634..4ec5d85 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -164,10 +164,10 @@
<el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
@click="set_ConfirmBill">渚涘簲鍟嗙‘璁�</el-button>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5">
<el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
@click="hanleCarOrDriver(form = rowForm)">鍒嗛厤杞﹁締鍜屽徃鏈�</el-button>
- </el-col>
+ </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>
@@ -263,8 +263,8 @@
</el-dialog>
<!-- 鎵撳嵃 -->
<el-dialog title="鎵撳嵃妯℃澘閫夋嫨" :visible.sync="openPrintList" width="800px" append-to-body>
- <PrintList :linterid=this.rowForm.HInterID :MyMsg=this.rowForm.HInterID :Type='HBillType'
- :HModName="HModName" @rowEditClose="rowSetClose" v-if="printListShow" />
+ <PrintList :linterid='printIds' :MyMsg='printIds' :Type='HBillType' :HModName="HBillType"
+ @rowEditClose="rowSetClose" v-if="printListShow" />
<!-- <div>111</div> -->
</el-dialog>
@@ -274,7 +274,8 @@
<el-input v-model="formVolume.鍗曟嵁鍙�" placeholder="璇疯緭鍏ュ崟鎹彿" disabled />
</el-form-item>
<el-form-item label="闆跺崟鍗犵敤浣撶Н">
- <el-input-number v-model="formVolume.currentVolume" :placeholder="`闆舵媴浣撶Н: ${formVolume.闆舵媴浣撶Н || 0}`" />
+ <el-input-number v-model="formVolume.currentVolume"
+ :placeholder="`闆舵媴浣撶Н: ${formVolume.闆舵媴浣撶Н || 0}`" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -344,7 +345,7 @@
baseURL: process.env.VUE_APP_BASE_API, //鍚庣鎺ュ彛鍓嶇紑(鍚庣鏈嶅姟鍣╥p鍦板潃)
HModName: "Cg_ContractTransportBillMainList",
- HBillType: "Cg_ContractTransportBillMainList",
+ HBillType: "WL_YayBill",
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
copyType: 0, //澶嶅埗鏍囪銆傛墦寮�缂栬緫缁勪欢鏃讹紝鐢ㄤ簬鍖哄垎缂栬緫杩樻槸澶嶅埗
HInterID: null,
@@ -445,6 +446,7 @@
totalNameList: [], // 闇�瑕佽缃悎璁¤鐨勫垪鏁扮粍
tableData: [], // 鍒楄〃鏁版嵁銆傜敤浜巘able鐩戝惉浜嬩欢
ids: [], // 閫変腑琛岀殑hmainid鏁扮粍
+ printIds: '', //鎵撳嵃閫夋嫨Id瀛楁
single: true, // 褰撻�変腑鐨勮鏁颁笉涓�1鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
multiple: true, // 褰撻�変腑鐨勮鏁颁负0鏃朵负true銆傜敤浜庣鐢ㄧ浉鍏虫搷浣�
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
@@ -860,7 +862,7 @@
HInterID: 0,
HEntryID0: 0,
currentVolume: 0,
-
+
鍗曟嵁鍙�: ''
}
},
@@ -1175,29 +1177,13 @@
//#region 鎵撳嵃
get_PrintReport() {
- if (this.ids.length != 1) {
- this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
- } else if (this.rowForm.鍗曟嵁鐘舵�� != "宸插鏍�" && !this.defaintOperationByCompanyName()) {
- this.$modal.msgError("鎵撳嵃澶辫触!鍘熷洜锛氬崟鎹姸鎬佷笉涓�'宸插鏍�'鐘舵��!!");
+ if (this.ids.length == 0) {
+ this.$modal.msgError("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�")
} else {
- axios.get(this.$baseUrl + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
- params: { "HInterID": this.rowForm.HInterID }
- }).then(response => {
- var result = response.data
- if (result.count == 1) {
- this.printListShow = true
- this.openPrintList = true
- // this.$router.push({ path:'/printList', query: { linterid: this.rowForm.hmainid,MyMsg:this.rowForm.hmainid,Type:'Kf_SellOutBillList' }})
- } else {
- this.$modal.msgError(result.code + result.Message)
- }
- }).catch(error => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
-
-
+ this.printIds = this.ids.join(',')
+ this.printListShow = true
+ this.openPrintList = true
}
- // var content= ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + data[0].hmainid.toString() + '&MyMsg=' + data[0].hmainid.toString() + '&Type=Kf_SellOutBillList', 'yes']
},
//#endregion
@@ -1356,7 +1342,7 @@
axios({
method: 'GET',
url: this.baseURL + "WLYayBillController/selectDriver1",
- params: {
+ params: {
"CarHNumber": this.carDriverForm.CarHNumber,
"CarHName": this.carDriverForm.CarHName,
"DriverHName": this.carDriverForm.DriverHName,
--
Gitblit v1.9.1