From 270977f369a982d99e559ac13712b04ebdd1e900 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 30 三月 2026 18:51:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue | 2
src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue | 2
src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue | 2
src/views/system/user/GyDriver.vue | 8
src/views/component/printList/hBarPlanPrint.vue | 3
src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue | 2
src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue | 4
src/views/logistics/transportGPS/WL_YayBill copy.vue | 1323 +++++++++++++++++++++++++++++++++++++++++
src/views/system/user/GyDriverEdit.vue | 12
src/views/sell/sellOut/sellOutBill.vue | 4
src/views/ProductInBill/Kf_ProductInBillList.vue | 47
src/views/logistics/transportGPS/WL_YayBill.vue | 126 +++
src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue | 2
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 352 +++++-----
src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue | 2
src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue | 2
16 files changed, 1,679 insertions(+), 214 deletions(-)
diff --git a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
index a4a8ed7..4e0e9a1 100644
--- a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
+++ b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillList.vue
@@ -545,7 +545,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '璐存爣绛炬暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '璐存爣绛炬暟蹇呴』澶т簬0锛�'
+ if (num <0) return '璐存爣绛炬暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
@@ -590,7 +590,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num <0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue b/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
index 3d5908c..167f89f 100644
--- a/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
+++ b/src/views/FbStepFoldinBillList/fbStepFoldinBillList.vue
@@ -684,7 +684,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue
index 2d2be38..677aa13 100644
--- a/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue
+++ b/src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue
@@ -666,7 +666,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/ProductInBill/Kf_ProductInBillList.vue b/src/views/ProductInBill/Kf_ProductInBillList.vue
index 9bba195..0a7958b 100644
--- a/src/views/ProductInBill/Kf_ProductInBillList.vue
+++ b/src/views/ProductInBill/Kf_ProductInBillList.vue
@@ -173,10 +173,11 @@
</el-table-column>
</template>
</el-table>
- <!-- 璁板綍鏁般�侀〉鏁般�佸綋鍓嶉〉 -->
- <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" @pagination="handleQuery" />
- <!-- 鍒楄缃� -->
+ <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>
<RowSettings :colName="btResList" HModName="Kf_ProductInBillList" @rowEditClose="rowSetClose"
v-if="rowHideShow" />
</el-dialog>
@@ -286,9 +287,17 @@
ColContent: '',
},
- page: 1, //page椤电储寮�
- pageSize: 0, //page椤甸潰璁板綍鏁�
- total: 0, //璁板綍鍚堣鏁�
+ loading: true,
+ tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+ btList: [],//琛ㄥご鍒楄〃鏄剧ず
+ btResList: [],
+ tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+ dataList: [],
+ titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ pageSizes: [ 50,100, 500, 5000, 50000],
+ page: 1,
+ pageSize: 0,
+ total: 0, //璁板綍鍚堣鏁�
tableShow: true, // table鏄剧ず鏍囪
totalNameList: [], // 闇�瑕佽缃悎璁¤鐨勫垪鏁扮粍
tableData: [], // 鍒楄〃鏁版嵁銆傜敤浜巘able鐩戝惉浜嬩欢
@@ -498,7 +507,6 @@
//#region 鏌ヨ
getList() {
- this.pageSize = 50
if (this.pageSize == 0) {
this.pageSize = 50
}
@@ -506,18 +514,19 @@
this.loading = true
// 鍒楄〃鏌ヨ
- axios.get(this.$baseUrl + '/Kf_ProductInBillController/GetKf_ProductInBillList_Json', {
+ axios.get(this.$baseUrl + '/Kf_ProductInBillController/page', {
params: {
"sWhere": this.sWhere,
- "HMaker": sessionStorage["HUserName"],
- "OperationType": 1,
- "ViewName": "h_v_Kf_ProductInBillList"
+ "user": sessionStorage["HUserName"],
+ "page": this.page,
+ "size": this.pageSize,
+ "Type":'3802',
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
let data1 = response.data
let option = []
- if (data1.count == 1) {
+ if (data1.list && data1.list.length > 0) {
this.btResList = data1.list //鍒楄〃琛ㄥご鏁版嵁
this.total = data1.count;
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -675,7 +684,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
@@ -811,11 +820,11 @@
this.totalNameList.push(item)
}
})
- if (data1.data[0].HPageSize == 0) {
- this.pageSize = 50
- } else {
- this.pageSize = data1.data[0].HPageSize
- }
+ // 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
@@ -921,7 +930,7 @@
var result = false;
axios.get(this.$baseUrl + '/Xt_getInfo/getCompanyName').then(response => {
var data1 = response.data
- if (data1.count == 1) {
+ if (data1.list && data1.list.length > 0) {
if (data1.data == "姘村姟") {
result = true;
}
diff --git a/src/views/component/printList/hBarPlanPrint.vue b/src/views/component/printList/hBarPlanPrint.vue
index 2c3fa76..0683433 100644
--- a/src/views/component/printList/hBarPlanPrint.vue
+++ b/src/views/component/printList/hBarPlanPrint.vue
@@ -71,6 +71,9 @@
) 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();
}
axios
.get(this.$baseUrl + "/CommonModel/searchMethod", {
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index b4db582..49297eb 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -12,7 +12,7 @@
<el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-tabs v-model="activeName" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="first">
- <!-- 绗竴鍧楋細鍗曟嵁鍙枫�佹棩鏈熴�佹簮鍗曞彿銆佹壙杩愬晢銆佸鎴� -->
+ <!-- 绗竴鍧楋細鍗曟嵁鍙枫�佹棩鏈熴�佹簮鍗曞彿銆佹壙杩愬晢銆佸鎴� -->
<div class="form-group">
<el-row>
<el-col :span="6">
@@ -29,7 +29,8 @@
<el-col :span="6">
<el-form-item label="婧愬崟鍙�" prop="HMainSourceBillNo">
<el-input v-model="form.HMainSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞彿">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(12)"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(12)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -37,14 +38,14 @@
<el-col :span="6"></el-col>
</el-row>
<el-row>
-
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="瀹㈡埛" prop="HCusName">
<el-input v-model="form.HCusName" placeholder="璇疯緭鍏ュ鎴�">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(7)"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(7)"></el-button>
</el-input>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="6">
<el-form-item label="甯佸埆" prop="HCurName">
<el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" />
@@ -61,24 +62,27 @@
<!-- 绗簩鍧楋細鎵胯繍鍚堝悓銆佸鍙戝湴銆佺洰鐨勫湴銆佽溅鍨嬨�佽溅鍨嬫渶澶у绉�佽窛绂汇�佽繍杈撴椂鏁堛�佽繍杈撶被鍨嬨�佺粨绠楁柟寮忋�佸竵鍒�佹眹鐜囥�佽繍璐广�佹�讳綋绉�佽杞界巼銆佽繍杈撴柟寮� -->
<div class="form-group">
<el-row>
- <el-col :span="6">
+ <el-col :span="6">
<el-form-item label="濮嬪彂鍦�" prop="HBeginAddrName">
<el-input v-model="form.HBeginAddrName" placeholder="璇疯緭鍏ュ鍙戝湴">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(3, areaType = 'b')"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(3, areaType = 'b')"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鐩殑鍦�" prop="HEndAddrName">
<el-input v-model="form.HEndAddrName" placeholder="璇疯緭鍏ョ洰鐨勫湴">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(3, areaType = 'e')"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(3, areaType = 'e')"></el-button>
</el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="杞﹀瀷" prop="HCarTypeName">
<el-input v-model="form.HCarTypeName" placeholder="璇疯緭鍏ヨ溅鍨�">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(13)"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(13)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -86,8 +90,9 @@
<el-row>
<el-col :span="6">
<el-form-item label="鎵胯繍鍚堝悓" prop="HContractTransportBillNo">
- <el-input v-model="form.HContractTransportBillNo" placeholder="璇疯緭鍏ユ壙杩愬悎鍚�" >
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog(16)"></el-button>
+ <el-input v-model="form.HContractTransportBillNo" placeholder="璇疯緭鍏ユ壙杩愬悎鍚�">
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog(16)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -114,12 +119,12 @@
<el-input v-model="form.HTransportTyep" placeholder="璇疯緭鍏ヨ繍杈撶被鍨�" readonly />
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="6">
<el-form-item label="璺濈锛堝叕閲岋級" prop="HDistance">
<el-input v-model="form.HDistance" placeholder="璇疯緭鍏ヨ窛绂�" readonly />
</el-form-item>
</el-col>
-
+
<el-col :span="6">
<el-form-item label="杩愯緭鏃舵晥" prop="HTransportTimes">
<el-input v-model="form.HTransportTimes" placeholder="璇疯緭鍏ヨ繍杈撴椂鏁�" readonly />
@@ -129,7 +134,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="缁勭粐" prop="HOrgID">
- <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐" @change="organizationChange" disabled>
+ <el-select v-model="form.HOrgID" placeholder="璇烽�夋嫨缁勭粐"
+ @change="organizationChange" disabled>
<el-option v-for="(item, index) in organizationList" :key="index"
:label="item.Name" :value="item.ID">
</el-option>
@@ -138,7 +144,7 @@
</el-col>
</el-row>
</div>
- <div class="form-group">
+ <div class="form-group">
<el-row>
<el-col :span="6">
<el-form-item label="杞﹀瀷鏈�澶у绉�" prop="HCarTypeMaxVolume">
@@ -147,30 +153,30 @@
</el-col>
<el-col :span="6">
<el-form-item label="鎬讳綋绉紙绔嬫柟绫筹級" prop="HTotalVolume">
- <el-input v-model="form.HTotalVolume" placeholder="璇疯緭鍏ユ�讳綋绉�" disabled/>
+ <el-input v-model="form.HTotalVolume" placeholder="璇疯緭鍏ユ�讳綋绉�" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="瑁呰浇鐜�" prop="HLoadingRate">
- <el-input v-model="form.HLoadingRate" placeholder="璇疯緭鍏ヨ杞界巼" disabled/>
+ <el-input v-model="form.HLoadingRate" placeholder="璇疯緭鍏ヨ杞界巼" disabled />
</el-form-item>
</el-col>
</el-row>
</div>
<!-- 绗笁鍧楋細鎻愯揣鍦板潃銆佸埌璐у湴鍧�銆佺粍缁囥�佽姹傛彁璐ф棩鏈熴�佹壙杩愬晢纭鏃ユ湡銆佺墿娴佺姸鎬� -->
<div class="form-group">
- <el-row>
- <el-col :span="6">
+ <!-- <el-row>
+ <el-col :span="6">
<el-form-item label="鎻愯揣鍦板潃" prop="HPickAddr">
<el-input v-model="form.HPickAddr" placeholder="璇疯緭鍏ユ彁璐у湴鍧�" />
</el-form-item>
- </el-col>
+ </el-col>
<el-col :span="6">
<el-form-item label="鍒拌揣鍦板潃" prop="HArriverAddr">
<el-input v-model="form.HArriverAddr" placeholder="璇疯緭鍏ュ埌璐у湴鍧�" />
</el-form-item>
</el-col>
- </el-row>
+ </el-row>-->
<el-row>
<el-col :span="6">
<el-form-item label="瑕佹眰鍒拌揪鏃ユ湡" prop="HDataForRequestedArrived">
@@ -217,11 +223,12 @@
<el-col :span="6">
<el-form-item label="缁撶畻鏂瑰紡" prop="HSSName">
<el-input v-model="form.HSSName" placeholder="璇疯緭鍏ョ粨绠楁柟寮�">
- <el-button slot="append" icon="el-icon-search" @click="openDataDialog('鏆傛棤')"></el-button>
+ <el-button slot="append" icon="el-icon-search"
+ @click="openDataDialog('鏆傛棤')"></el-button>
</el-input>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="6">
<el-form-item label="杩愯垂" prop="HMoney">
<el-input v-model="form.HMoney" placeholder="璇疯緭鍏ヨ繍璐�" />
</el-form-item>
@@ -244,7 +251,7 @@
</div>
</el-tab-pane>
<el-tab-pane label="鐗╂祦淇℃伅" name="forth">
- <div class="form-group">
+ <div class="form-group">
<el-row>
<el-col :span="6">
<el-form-item label="鐗╂祦鐘舵��" prop="HCarryStatus">
@@ -262,12 +269,12 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鎵胯繍鍟嗙‘璁ゆ棩鏈�" prop="HDate_CarrierSure">
- <el-date-picker v-model="form.HDate_CarrierSure" type="date" placeholder="閫夋嫨鎵胯繍鍟嗙‘璁ゆ棩鏈�"
- format="yyyy-MM-dd hh:mm:ss" disabled>
- </el-date-picker>
- </el-form-item>
- </el-col>
+ <el-form-item label="鎵胯繍鍟嗙‘璁ゆ棩鏈�" prop="HDate_CarrierSure">
+ <el-date-picker v-model="form.HDate_CarrierSure" type="date"
+ placeholder="閫夋嫨鎵胯繍鍟嗙‘璁ゆ棩鏈�" format="yyyy-MM-dd hh:mm:ss" disabled>
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item label="鍒嗛厤鍙告満鏃ユ湡" prop="HDate_AllocationDriver">
<el-date-picker v-model="form.HDate_AllocationDriver" type="date"
@@ -301,22 +308,22 @@
<el-row>
<el-col :span="6">
<el-form-item label="鍒板巶纭鏃堕棿" prop="HDate_Arrive">
- <el-date-picker v-model="form.HDate_Arrive" type="date" format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鍒板巶纭鏃堕棿" disabled>
+ <el-date-picker v-model="form.HDate_Arrive" type="date"
+ format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍒板巶纭鏃堕棿" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎻愯揣纭鏃堕棿" prop="HDate_Pick">
- <el-date-picker v-model="form.HDate_Pick" type="date" format="yyyy-MM-dd hh:mm:ss"
- placeholder="閫夋嫨鎻愯揣纭鏃堕棿" disabled>
+ <el-date-picker v-model="form.HDate_Pick" type="date"
+ format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨鎻愯揣纭鏃堕棿" disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鍑哄巶杩愯緭纭鏃堕棿" prop="HDate_Trans">
- <el-date-picker v-model="form.HDate_Trans" type="date" format="yyyy-MM-dd hh:mm:ss"
- placeholder="閫夋嫨鍒板嚭鍘傝繍杈撶‘璁ゆ椂闂�" disabled>
+ <el-date-picker v-model="form.HDate_Trans" type="date"
+ format="yyyy-MM-dd hh:mm:ss" placeholder="閫夋嫨鍒板嚭鍘傝繍杈撶‘璁ゆ椂闂�" disabled>
</el-date-picker>
</el-form-item>
</el-col>
@@ -357,7 +364,8 @@
<el-row>
<el-col :span="6">
<el-form-item label="鍒跺崟鏃ユ湡" prop="HMakeDate">
- <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HMakeDate" type="date" placeholder="閫夋嫨鍒跺崟鏃ユ湡"
+ disabled>
</el-date-picker>
</el-form-item>
</el-col>
@@ -370,13 +378,15 @@
</el-col>
<el-col :span="6">
<el-form-item label="瀹℃牳鏃ユ湡" prop="HCheckDate">
- <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCheckDate" type="date" placeholder="閫夋嫨瀹℃牳鏃ユ湡"
+ disabled>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鍏抽棴鏃ユ湡" prop="HCloseDate">
- <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡" disabled>
+ <el-date-picker v-model="form.HCloseDate" type="date" placeholder="閫夋嫨鍏抽棴鏃ユ湡"
+ disabled>
</el-date-picker>
</el-form-item>
</el-col>
@@ -417,6 +427,17 @@
<span>{{ scope.row.HSourceBillNo }}</span>
</template>
</el-table-column>
+ <el-table-column align="center" label="瀹㈡埛" prop="HCusName" width="120" />
+ <el-table-column align="center" label="鎻愯揣鍦板潃" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HPickAddr" placeholder="璇疯緭鍏ユ彁璐у湴鍧�" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="鍒拌揣鍦板潃" width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HArriverAddr" placeholder="璇疯緭鍏ュ埌璐у湴鍧�" />
+ </template>
+ </el-table-column>
<el-table-column align="center" label="鐗╂枡浠ｇ爜" width="120">
<template slot-scope="scope">{{ scope.row.HMaterNumber }} </template>
</el-table-column>
@@ -440,7 +461,7 @@
<span>{{ scope.row.HStandardQtyForMouldInPack }}</span>
</template>
</el-table-column>
-
+
<el-table-column align="center" label="鐗╂枡鏁伴噺" width="150">
<template slot-scope="scope">
<el-input-number v-model="scope.row.HQty" :min="0" style="width: 120px;"
@@ -461,10 +482,9 @@
</template>
</el-table-column>
<el-table-column align="center" label="鎵樻暟" width="120">
- <template slot-scope="scope"> <!--HPackQTY=HMouldQty/HStandardQtyForMouldInPack -->
+ <template slot-scope="scope"> <!--HPackQTY=HMouldQty/HStandardQtyForMouldInPack -->
<el-input-number v-model="scope.row.HPackQTY" :min="0" style="width: 90px;"
- controls-position="right"
- @change="changeHPackQty(scope.row)"></el-input-number>
+ controls-position="right" @change="changeHPackQty(scope.row)"></el-input-number>
</template>
</el-table-column>
<el-table-column align="center" label="鎵樺崟浣嶄綋绉�" width="120">
@@ -474,9 +494,8 @@
</el-table-column>
<el-table-column align="center" label="浣撶Н" width="120">
<template slot-scope="scope">
- <el-input-number v-model="scope.row.HVolume" :min="0" style="width: 90px;"
- controls-position="right"
- @change="changeHVolume(scope.row)"></el-input-number>
+ <el-input-number v-model="scope.row.HVolume" :min="0" style="width: 90px;"
+ controls-position="right" @change="changeHVolume(scope.row)"></el-input-number>
</template>
</el-table-column>
<el-table-column align="center" label="闆跺崟鍗犵敤浣撶Н" width="120">
@@ -533,7 +552,8 @@
<GyCar @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCarShow" />
<GyDriver @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyDriverShow" />
<ContractTransport @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
- v-if="ContractTransportShow" :propHBeginAddrName="form.HBeginAddr" :propHBeginHEndAddrName="form.HEndAddr" :propHCarTypeName="form.HCarTypeID"/>
+ v-if="ContractTransportShow" :propHBeginAddrName="form.HBeginAddr"
+ :propHBeginHEndAddrName="form.HEndAddr" :propHCarTypeName="form.HCarTypeID" />
<GyMaterialPackingRelation @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
:propHMaterID="editData[zbIndex].HMaterID" :propHOrgID="form.HOrgID"
v-if="gyMaterialPackingRelationShow" />
@@ -843,14 +863,14 @@
this.form.HInnerBillNo = data.鍐呴儴鍗曟嵁鍙�
this.form.HCarrierID = data.鎵胯繍鍟咺D
this.form.HCarrierName = data.鎵胯繍鍟嗗悕绉�
- this.form.HCusID = data.HCusID
- this.form.HCusName = data.瀹㈡埛鍚嶇О
+ // this.form.HCusID = data.HCusID
+ // this.form.HCusName = data.瀹㈡埛鍚嶇О
this.form.HBeginAddr = data.濮嬪彂鍦�
this.form.HBeginAddrName = data.濮嬪彂鍦板悕绉�
this.form.HEndAddr = data.鐩殑鍦�
this.form.HEndAddrName = data.鐩殑鍦板悕绉�
- this.form.HPickAddr = data.鎻愯揣鍦板潃
- this.form.HArriverAddr = data.鍒拌揣鍦板潃
+ // this.form.HPickAddr = data.鎻愯揣鍦板潃
+ // this.form.HArriverAddr = data.鍒拌揣鍦板潃
this.form.HTransType = data.杩愯緭鏂瑰紡
this.form.HCarTypeID = data.杞﹀瀷ID
this.form.HCarTypeName = data.杞﹀瀷鍚嶇О
@@ -894,6 +914,10 @@
"HSourceInterID": result.data[i].婧愬崟涓诲唴鐮�,
"HSourceEntryID": result.data[i].婧愬崟瀛愬唴鐮�,
"HSourceBillNo": result.data[i].婧愬崟鍗曟嵁,
+ "HCusID": result.data[i].HCusID,
+ "HCusName": result.data[i].瀹㈡埛鍚嶇О,
+ "HPickAddr": result.data[i].鎻愯揣鍦板潃,
+ "HArriverAddr": result.data[i].鍒拌揣鍦板潃,
"HMaterID": result.data[i].HMaterID,
"HMaterNumber": result.data[i].鐗╂枡浠ｇ爜,
"HMaterName": result.data[i].鐗╂枡鍚嶇О,
@@ -1172,27 +1196,27 @@
async processSourceDataAsync(deptRow) {
try {
// 璁剧疆瀹㈡埛淇℃伅
- if (!this.form.HCusID && deptRow.length > 0) {
- this.form.HCusID = deptRow[0]["HCusID"];
- this.form.HCusName = deptRow[0]["瀹㈡埛"];
- }
+ // if (!this.form.HCusID && deptRow.length > 0) {
+ // this.form.HCusID = deptRow[0]["HCusID"];
+ // this.form.HCusName = deptRow[0]["瀹㈡埛"];
+ // }
console.log(deptRow)
this.form.HMainSourceInterID = deptRow[0]["hmainid"]
this.form.HMainSourceEntryID = deptRow[0]["hsubid"]
this.form.HMainSourceBillType = deptRow[0]["HBillType"]
this.form.HMainSourceBillNo = deptRow[0]["鍗曟嵁鍙�"]
- this.form.HCurName = deptRow[0]["甯佸埆"]
- this.form.HCurID = deptRow[0]["HCurID"]
- this.form.HExRate = deptRow[0]["姹囩巼"]
+ // this.form.HCurName = deptRow[0]["甯佸埆"]
+ // this.form.HCurID = deptRow[0]["HCurID"]
+ // this.form.HExRate = deptRow[0]["姹囩巼"]
// 妫�鏌ユ槸鍚︽墍鏈夎褰曞睘浜庡悓涓�瀹㈡埛
- for (var i = 0; i < deptRow.length; i++) {
- if (deptRow[i]["HCusID"] != this.form.HCusID) {
- this.$modal.msgError("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛锛岃纭繚閫夋嫨鐨勬簮鍗曞睘浜庡悓涓�瀹㈡埛!");
- this.xsSeOutStockBillShow = false;
- this.openData = false;
- return;
- }
- }
+ // for (var i = 0; i < deptRow.length; i++) {
+ // if (deptRow[i]["HCusID"] != this.form.HCusID) {
+ // this.$modal.msgError("涓嬫帹澶辫触!宸茬粡閫変腑鐨勮褰曚腑瀛樺湪涓嶅悓瀹㈡埛锛岃纭繚閫夋嫨鐨勬簮鍗曞睘浜庡悓涓�瀹㈡埛!");
+ // this.xsSeOutStockBillShow = false;
+ // this.openData = false;
+ // return;
+ // }
+ // }
// 妫�鏌ユ柊閫夋嫨鐨勬簮鍗曟槸鍚﹀凡缁忓湪瀛愯〃涓瓨鍦�
var isDuplicate = this.checkDuplicateSource(deptRow);
@@ -1264,7 +1288,7 @@
materialMap[materialId] = [];
}
materialMap[materialId].push({
- HMaterID:dataArray[i].HMaterID,
+ HMaterID: dataArray[i].HMaterID,
hmainid: dataArray[i].hmainid,
hsubid: dataArray[i].hsubid,
鍗曟嵁鍙�: dataArray[i].鍗曟嵁鍙�
@@ -1289,19 +1313,15 @@
"ListMaterial": ListMaterial
},
});
-
let result = response.data;
if (result.count == 1) {
let res = result.data;
- console.log(11,res)
+ console.log(res)
var newRows = [];
// 涓烘瘡涓簮鍗曡鍒涘缓瀵瑰簲鐨勫瓙琛ㄨ
for (var materialId in materialMap) {
var sourceInfos = materialMap[materialId];
- console.log("鍙戣揣閫氱煡鍗曟暟鎹�",dataArray)
- console.log("1鍙戣揣閫氱煡鍗曟暟鎹�",dataArray[0])
- if(res.length===0)
- {
+ if (res.length === 0) {
// 涓烘瘡涓簮鍗曡鍒涘缓涓�鏉¤褰�
for (var j = 0; j < sourceInfos.length; j++) {
var sourceInfo = sourceInfos[j];
@@ -1327,16 +1347,19 @@
var mouldQty = 0;
var HPackQTY = 0;
var rowVolume = 0;
+ // if
newRows.push({
"HSourceInterID": sourceInfo.hmainid,
"HSourceEntryID": sourceInfo.hsubid,
"HSourceBillNo": sourceInfo.鍗曟嵁鍙�,
+ "HCusID": dataArray[j].HCusID,
+ "HCusName": dataArray[j].瀹㈡埛,
"HMaterID": dataArray[j].HMaterID,
"HMaterNumber": dataArray[j].鐗╂枡浠ｇ爜,
"HMaterName": dataArray[j].鐗╂枡鍚嶇О,
"HUnitID": dataArray[j].HUnitID,
- "HPackV": dataArray[j].鎵樺崟浣嶄綋绉�,
- "HStandardQtyForMouldInPack": dataArray[j].瀹瑰櫒鏁伴噺/鎵�,
+ // "HPackV": dataArray[j].鎵樺崟浣嶄綋绉�,
+ // "HStandardQtyForMouldInPack": dataArray[j].瀹瑰櫒鏁伴噺 / 鎵�,
"HMouldID": 0,
"HMouldNumber": '',
"HMouldName": '',
@@ -1352,9 +1375,7 @@
HScatteredVolume: 0,
});
}
- }
- else
- {
+ } else {
// 鏌ユ壘璇ョ墿鏂橧D瀵瑰簲鐨勫寘瑁呭鍣ㄤ俊鎭�
var materialInfo = null;
for (var i = 0; i < res.length; i++) {
@@ -1364,71 +1385,75 @@
}
}
if (materialInfo) {
- // 涓烘瘡涓簮鍗曡鍒涘缓涓�鏉¤褰�
- for (var j = 0; j < sourceInfos.length; j++) {
- var sourceInfo = sourceInfos[j];
+ // 涓烘瘡涓簮鍗曡鍒涘缓涓�鏉¤褰�
+ for (var j = 0; j < sourceInfos.length; j++) {
+ var sourceInfo = sourceInfos[j];
- // 鍐嶆妫�鏌ユ槸鍚﹀凡瀛樺湪锛堝弻閲嶄繚闄╋級
- var isExist = false;
- for (var k = 0; k < existingData.length; k++) {
- if (existingData[k].HSourceInterID == sourceInfo.hmainid &&
- existingData[k].HSourceEntryID == sourceInfo.hsubid) {
- isExist = true;
- break;
+ // 鍐嶆妫�鏌ユ槸鍚﹀凡瀛樺湪锛堝弻閲嶄繚闄╋級
+ var isExist = false;
+ for (var k = 0; k < existingData.length; k++) {
+ if (existingData[k].HSourceInterID == sourceInfo.hmainid &&
+ existingData[k].HSourceEntryID == sourceInfo.hsubid) {
+ isExist = true;
+ break;
+ }
}
- }
- if (isExist) {
- this.$modal.msgError(`婧愬崟${sourceInfo.鍗曟嵁鍙穧宸插瓨鍦紝璺宠繃`);
- continue;
- }
+ if (isExist) {
+ this.$modal.msgError(`婧愬崟${sourceInfo.鍗曟嵁鍙穧宸插瓨鍦紝璺宠繃`);
+ continue;
+ }
- // 璁＄畻鐩稿叧鏁伴噺
- var qty = orginHQTY || 0;
- var snp = materialInfo.HSNP || 0;
- var mouldQty = 0;
-
- if (snp > 0) {
- mouldQty = Math.ceil(qty / snp);
- }
-
- var HPackQTY = 0;
- if (materialInfo.HStandardQtyForMouldInPack > 0 && mouldQty > 0) {
- HPackQTY = Math.ceil(mouldQty / materialInfo.HStandardQtyForMouldInPack);
- }
-
- var rowVolume = (HPackQTY * materialInfo.HPackV).toFixed(2);
- newRows.push({
- "HSourceInterID": sourceInfo.hmainid,
- "HSourceEntryID": sourceInfo.hsubid,
- "HSourceBillNo": sourceInfo.鍗曟嵁鍙�,
- "HMaterID": materialInfo.HMaterID,
- "HMaterNumber": materialInfo.鐗╂枡浠ｇ爜,
- "HMaterName": materialInfo.鐗╂枡鍚嶇О,
- "HUnitID": materialInfo.HUnitID,
- "HMouldID": materialInfo.HMouldID,
- "HMouldNumber": materialInfo.HMouldNumber,
- "HMouldName": materialInfo.HMouldName,
- "HMouldLength": materialInfo.闀垮害,
- "HMouldWidth": materialInfo.瀹藉害,
- "HMouldHeight": materialInfo.楂樺害,
- "HMouldFoldHeight": materialInfo.鎶樺彔楂樺害,
- "HQty": orginHQTY,
- "HQty_origin": orginHQTY,
- "HMouldQty": mouldQty,
- "HVolume": rowVolume,
- "HSNP": materialInfo.HSNP,
- HScatteredVolume: 0,
- "HPackV": materialInfo.HPackV,
- "HStandardQtyForMouldInPack": materialInfo.HStandardQtyForMouldInPack,
- "HPackQTY": HPackQTY,
- });
- this.form.HTotalVolume=this.form.HTotalVolume*1+rowVolume *1
+ // 璁＄畻鐩稿叧鏁伴噺
+ var qty = orginHQTY || 0;
+ var snp = materialInfo.HSNP || 0;
+ var mouldQty = 0;
+ if (snp > 0) {
+ mouldQty = Math.ceil(qty / snp);
+ }
+
+ var HPackQTY = 0;
+ if (materialInfo.HStandardQtyForMouldInPack > 0 && mouldQty > 0) {
+ HPackQTY = Math.ceil(mouldQty / materialInfo.HStandardQtyForMouldInPack);
+ }
+
+ var rowVolume = (HPackQTY * materialInfo.HPackV).toFixed(2);
+ newRows.push({
+ "HSourceInterID": sourceInfo.hmainid,
+ "HSourceEntryID": sourceInfo.hsubid,
+ "HSourceBillNo": sourceInfo.鍗曟嵁鍙�,
+ "HCusID": materialInfo.HCusID,
+ "HCusName": materialInfo.瀹㈡埛,
+ "HMaterID": materialInfo.HMaterID,
+ "HMaterNumber": materialInfo.鐗╂枡浠ｇ爜,
+ "HMaterName": materialInfo.鐗╂枡鍚嶇О,
+ "HUnitID": materialInfo.HUnitID,
+ "HMouldID": materialInfo.HMouldID,
+ // "HPackV": materialInfo.鎵樺崟浣嶄綋绉�,
+ // "HStandardQtyForMouldInPack": materialInfo.瀹瑰櫒鏁伴噺 / 鎵�,
+ "HMouldNumber": materialInfo.HMouldNumber,
+ "HMouldName": materialInfo.HMouldName,
+ "HMouldLength": materialInfo.闀垮害,
+ "HMouldWidth": materialInfo.瀹藉害,
+ "HMouldHeight": materialInfo.楂樺害,
+ "HMouldFoldHeight": materialInfo.鎶樺彔楂樺害,
+ "HQty": orginHQTY,
+ "HQty_origin": orginHQTY,
+ "HMouldQty": mouldQty,
+ "HVolume": rowVolume,
+ "HSNP": materialInfo.HSNP,
+ HScatteredVolume: 0,
+ "HPackV": materialInfo.HPackV,
+ "HStandardQtyForMouldInPack": materialInfo.HStandardQtyForMouldInPack,
+ "HPackQTY": HPackQTY,
+ });
+ this.form.HTotalVolume = this.form.HTotalVolume * 1 + rowVolume * 1
+
+ }
}
}
- }
-
+
}
@@ -1567,11 +1592,11 @@
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�")
} else {
let copyRow = JSON.parse(JSON.stringify(this.zbSelForm))
- copyRow.HPackQTY=0,
- copyRow.HMouldQty=0,
- copyRow.HQty=0,
- copyRow.HVolume=0
- copyRow.HScatteredVolume=0
+ copyRow.HPackQTY = 0,
+ copyRow.HMouldQty = 0,
+ copyRow.HQty = 0,
+ copyRow.HVolume = 0
+ copyRow.HScatteredVolume = 0
this.editData.push(copyRow);
}
},
@@ -1781,7 +1806,7 @@
let HPackQty = 0;
const standardQty = parseFloat(this.editData[row.index - 1].HStandardQtyForMouldInPack) || 0;
const mouldQty = parseFloat(row.HMouldQty) || 0;
-
+
if (standardQty > 0 && mouldQty > 0) {
HPackQty = Math.ceil(mouldQty / standardQty);
} else {
@@ -1789,7 +1814,7 @@
this.$message.warning('瀹瑰櫒鏁伴噺/鎵樹负0锛屾墭鏁板皢琚缃负0');
}
}
-
+
if (!HPackQty || HPackQty == 'Infinity') {
this.editData[row.index - 1].HPackQTY = 0;
} else {
@@ -1806,13 +1831,13 @@
const packQty = parseFloat(this.editData[this.zbIndex].HPackQTY) || 0;
const packV = parseFloat(this.editData[this.zbIndex].HPackV) || 0;
let Volume = ((packQty * packV).toFixed(2)) - 0;
-
+
if (!Volume) {
this.editData[this.zbIndex].HVolume = 0;
} else {
this.editData[this.zbIndex].HVolume = Volume;
}
-
+
this.form.HTotalVolume = 0;
this.editData.map(item => {
this.form.HTotalVolume = Number(item.HVolume) + this.form.HTotalVolume;
@@ -1822,17 +1847,17 @@
//#region 浣撶Н鍊煎彉鍖栧鐞�
changeHVolume(row) {
this.zbIndex = row.index - 1;
-
+
// 纭繚浣撶Н鍊兼湁鏁�
const volume = parseFloat(row.HVolume) || 0;
this.editData[this.zbIndex].HVolume = volume;
-
+
// 鏇存柊琛ㄥご鎬讳綋绉�
this.form.HTotalVolume = 0;
this.editData.map(item => {
this.form.HTotalVolume = Number(item.HVolume) + this.form.HTotalVolume;
});
-
+
// 鏇存柊瑁呰浇鐜�
this.calculateLoadingRate(parseFloat(this.form.HTotalVolume || 0));
},
@@ -1848,7 +1873,7 @@
}
},
//#endregion
- checkTotalQtyExceed(selRow) {
+ checkTotalQtyExceed(selRow) {
var tableData = this.editData
if (!tableData || tableData.length === 0) return;
var sourceQtyMap = {};
@@ -1917,7 +1942,7 @@
const SNP = parseFloat(this.editData[selRow.index - 1].HSNP) || 0;
const HQty = parseFloat(selRow.HQty) || 0;
let warningMessages = [];
-
+
if (SNP > 0) {
let MouldQty = Math.ceil(HQty / SNP);
if (!MouldQty || MouldQty == 'Infinity') {
@@ -1929,10 +1954,10 @@
this.editData[selRow.index - 1].HMouldQty = 0;
warningMessages.push('鏍囧噯鍖呰鏁伴噺涓�0锛屽寘瑁呭鍣ㄦ暟閲忓皢琚缃负0');
}
-
+
const standardQtyForMouldInPack = parseFloat(this.editData[selRow.index - 1].HStandardQtyForMouldInPack) || 0;
const HMouldQty = parseFloat(this.editData[selRow.index - 1].HMouldQty) || 0;
-
+
if (standardQtyForMouldInPack > 0 && HMouldQty > 0) {
let HPackQTY = Math.ceil(HMouldQty / standardQtyForMouldInPack);
if (!HPackQTY || HPackQTY == 'Infinity') {
@@ -1946,11 +1971,11 @@
}
this.editData[selRow.index - 1].HPackQTY = 0;
}
-
+
if (warningMessages.length > 0) {
this.$message.warning(warningMessages.join('锛�'));
}
-
+
const HPackQTY = parseFloat(this.editData[selRow.index - 1].HPackQTY) || 0;
const HPackV = parseFloat(this.editData[selRow.index - 1].HPackV) || 0;
let HVolume = ((HPackQTY * HPackV).toFixed(2)) - 0;
@@ -1959,13 +1984,13 @@
} else {
this.editData[selRow.index - 1].HVolume = HVolume;
}
-
+
this.form.HTotalVolume = 0;
this.editData.map(item => {
this.form.HTotalVolume = Number(item.HVolume) + this.form.HTotalVolume;
});
this.calculateLoadingRate(parseFloat(this.form.HTotalVolume || 0));
-
+
return false; // 琛ㄧず娌℃湁瓒呭嚭
},
//#region 闄勪欢涓婁紶鐩稿叧鏂规硶
@@ -2092,10 +2117,15 @@
.xsckdBox .el-date-editor.el-input {
width: 100%;
}
+
.form-group {
- border: 1px solid #ddd; /* 鐏拌壊杈规 */
- padding: 15px; /* 鍐呰竟璺濓紝璁╁唴瀹逛笌杈规鏈夐棿璺� */
- border-radius: 4px; /* 鍙�夊渾瑙� */
- margin-bottom: 20px; /* 淇濇寔鍘熸湁鐨勪笅杈硅窛 */
+ border: 1px solid #ddd;
+ /* 鐏拌壊杈规 */
+ padding: 15px;
+ /* 鍐呰竟璺濓紝璁╁唴瀹逛笌杈规鏈夐棿璺� */
+ border-radius: 4px;
+ /* 鍙�夊渾瑙� */
+ margin-bottom: 20px;
+ /* 淇濇寔鍘熸湁鐨勪笅杈硅窛 */
}
</style>
diff --git a/src/views/logistics/transportGPS/WL_YayBill copy.vue b/src/views/logistics/transportGPS/WL_YayBill copy.vue
new file mode 100644
index 0000000..4d75c68
--- /dev/null
+++ b/src/views/logistics/transportGPS/WL_YayBill copy.vue
@@ -0,0 +1,1323 @@
+<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 57b12f2..4a67634 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -17,8 +17,14 @@
</el-select>
</el-form-item>
<el-form-item label="鍗曟嵁鍙�" prop="HBillNo">
- <el-input v-model="queryParams.HBillNo" placeholder="璇疯緭鍏ュ崟鎹彿" @keyup.enter.native="handleQuery" />
+ <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"
@@ -158,9 +164,17 @@
<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>
+ @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"
@@ -197,6 +211,9 @@
<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>
@@ -257,7 +274,7 @@
<el-input v-model="formVolume.鍗曟嵁鍙�" placeholder="璇疯緭鍏ュ崟鎹彿" disabled />
</el-form-item>
<el-form-item label="闆跺崟鍗犵敤浣撶Н">
- <el-input-number v-model="formVolume.currentVolume" placeholder="璇疯緭鍏ラ浂鍗曞崰鐢ㄤ綋绉�" />
+ <el-input-number v-model="formVolume.currentVolume" :placeholder="`闆舵媴浣撶Н: ${formVolume.闆舵媴浣撶Н || 0}`" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -281,6 +298,27 @@
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
+ <!-- 鍒嗛厤杞﹁締鍜屽徃鏈� -->
+ <el-dialog title="鍒嗛厤杞﹁締鍜屽徃鏈�" :visible.sync="openCarDriver" width="500px" append-to-body>
+ <el-form ref="carDriverForm" :model="carDriverForm" :rules="carDriverRules" label-width="100px">
+ <el-form-item label="杞︾墝鍙�" prop="CarHNumber">
+ <el-input v-model="carDriverForm.CarHNumber" placeholder="璇疯緭鍏ヨ溅鐗屽彿" />
+ </el-form-item>
+ <el-form-item label="杞﹁締鍚嶇О" prop="CarHName">
+ <el-input v-model="carDriverForm.CarHName" placeholder="璇疯緭鍏ヨ溅杈嗗悕绉�" />
+ </el-form-item>
+ <el-form-item label="椹鹃┒鍛�" prop="DriverHName">
+ <el-input v-model="carDriverForm.DriverHName" placeholder="璇疯緭鍏ラ┚椹跺憳" />
+ </el-form-item>
+ <el-form-item label="韬唤璇佸彿" prop="DriverHIDCard">
+ <el-input v-model="carDriverForm.DriverHIDCard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" />
+ </el-form-item>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button type="primary" @click="submitCarDriver">纭� 瀹�</el-button>
+ <el-button @click="openCarDriver = false">鍙� 娑�</el-button>
</div>
</el-dialog>
</div>
@@ -361,6 +399,19 @@
packStockDetailShow: false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗗鍣ㄦ樉绀烘爣璁�
openVolume: false, //缁存姢闆跺崟鍗犵敤浣撶Н寮圭獥鏍囪
openData: false, //鏁版嵁寮圭獥
+ openCarDriver: false, //鍒嗛厤杞﹁締鍜屽徃鏈哄脊绐楁爣璁�
+ carDriverForm: { //鍒嗛厤杞﹁締鍜屽徃鏈鸿〃鍗�
+ CarHNumber: '',
+ CarHName: '',
+ DriverHName: '',
+ DriverHIDCard: ''
+ },
+ carDriverRules: { //鍒嗛厤杞﹁締鍜屽徃鏈鸿〃鍗曢獙璇�
+ CarHNumber: [{ required: true, message: '璇疯緭鍏ヨ溅鐗屽彿', trigger: 'blur' }],
+ CarHName: [{ required: true, message: '璇疯緭鍏ヨ溅杈嗗悕绉�', trigger: 'blur' }],
+ DriverHName: [{ required: true, message: '璇疯緭鍏ラ┚椹跺憳', trigger: 'blur' }],
+ DriverHIDCard: [{ required: true, message: '璇疯緭鍏ヨ韩浠借瘉鍙�', trigger: 'blur' }],
+ },
dialogTypeNum: null, //閮ㄩ棬寮圭獥1锛屼粨搴撳脊绐�2
gyCarShow: false, //杞﹁締鏁版嵁缁勪欢鏄剧ず鏍囪
gyDriverShow: false, //鍙告満鏁版嵁缁勪欢鏄剧ず鏍囪
@@ -369,6 +420,7 @@
sWhere: '', // 鎷兼帴杩囨护鏉′欢
queryParams: { // form鏁版嵁
HBillNo: '',
+ HPlateNumber: '',
HInitTimeCycle: 29,
sTime: '',
eTime: '',
@@ -386,7 +438,6 @@
ColContent2: '',
ColContent: '',
},
-
page: 1, //page椤电储寮�
pageSize: 0, //page椤甸潰璁板綍鏁�
total: 0, //璁板綍鍚堣鏁�
@@ -503,20 +554,19 @@
},
//#endregion
//#region 鏉冮檺鍒ゆ柇
- async set_ModCheck(ModRightNameCheck)
- {
+ async set_ModCheck(ModRightNameCheck) {
var Permission = false;
- const res=await axios.get(this.$baseUrl + '/LMES/getReportByModRightNameCheck', {
+ const res = await axios.get(this.$baseUrl + '/LMES/getReportByModRightNameCheck', {
params: {
"ModRightNameCheck": ModRightNameCheck,
"user": sessionStorage["HUserName"],
-
+
},
- }).then(result=>{
+ }).then(result => {
if (result.data.count != 1) {
- Permission = true;
- this.sWhere=this.sWhere+" and 鎵胯繍鍟咺D ="+sessionStorage["HSupID"]
- }
+ Permission = true;
+ this.sWhere = this.sWhere + " and 鎵胯繍鍟咺D =" + sessionStorage["HSupID"]
+ }
}).catch(error => {
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
@@ -597,10 +647,14 @@
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)
+ console.log("swhere", this.sWhere)
this.clearData()
this.getList()
},
@@ -614,7 +668,7 @@
}
this.tableShow = false
this.loading = true
- console.log("swhere",this.sWhere)
+ console.log("swhere", this.sWhere)
// 鍒楄〃鏌ヨ
axios.get(this.$baseUrl + '/WLYayBillController/GetListPage', {
params: {
@@ -806,6 +860,7 @@
HInterID: 0,
HEntryID0: 0,
currentVolume: 0,
+
鍗曟嵁鍙�: ''
}
},
@@ -841,6 +896,7 @@
cancelVolume() {
this.openVolume = false
this.resetVolume()
+ this.handleQuery()
},
//#region 缁存姢闆跺崟鍗犵敤浣撶Н鎻愪氦
set_HScatteredVolumeList() {
@@ -1230,6 +1286,7 @@
IsAudit = 2
}
try {
+ console.log(deptRow)
const response = await axios.get(this.baseURL + '/WLYayBillController/selectDriver', {
params: {
"HInterID": this.rowForm.HInterID.toString(),
@@ -1283,6 +1340,47 @@
},
//#endregion
//#endregion
+ //#region 鍒嗛厤杞﹁締鍜屽徃鏈�
+ hanleCarOrDriver(form) {
+ this.carDriverForm = {
+ CarHNumber: '',
+ CarHName: '',
+ DriverHName: '',
+ DriverHIDCard: ''
+ }
+ this.openCarDriver = true
+ },
+ submitCarDriver() {
+ this.$refs.carDriverForm.validate((valid) => {
+ if (valid) {
+ axios({
+ method: 'GET',
+ url: this.baseURL + "WLYayBillController/selectDriver1",
+ params: {
+ "CarHNumber": this.carDriverForm.CarHNumber,
+ "CarHName": this.carDriverForm.CarHName,
+ "DriverHName": this.carDriverForm.DriverHName,
+ "DriverHIDCard": this.carDriverForm.DriverHIDCard,
+ "CurUserName": sessionStorage["HUserName"],
+ "HInterID": this.rowForm.HInterID
+ },
+ }).then(response => {
+ let result = response.data
+ if (result.code == 1) {
+ this.$modal.msgSuccess(result.Message || "鍒嗛厤鎴愬姛");
+ this.openCarDriver = false
+ this.handleQuery()
+ } else {
+ this.$modal.msgError(result.code + result.Message);
+ }
+ }).catch(error => {
+ console.log(error)
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
+ }
+ })
+ },
+ //#endregion
//娓呴櫎閫変腑鏁版嵁鐨勭紦瀛�
clearData() {
this.ids = []
diff --git a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
index 4b508cc..f9ea0f3 100644
--- a/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
+++ b/src/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue
@@ -886,7 +886,7 @@
},
set_CheckBill(num) {
//閫昏緫瀹℃牳鏂规硶
- axios.get(this.$baseUrl + "/Sc_MouldinventoryBill/CheckGy_MaterialMouldBillMain", {
+ axios.get(this.$baseUrl + "/Gy_MaterialPackingRelation/AuditGy_MaterialPackingRelation", {
params: { "HInterID": this.rowForm.hmainid, "IsAudit": num, "CurUserName": sessionStorage["HUserName"] }
}).then(response => {
let result = response.data
diff --git a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
index 170e854..a94ea86 100644
--- a/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldInRequestBillList.vue
@@ -889,7 +889,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num <0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
index 6aeeacd..a60fcac 100644
--- a/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldOutRequestBillList.vue
@@ -890,7 +890,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num <0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
index cc3c590..0c12431 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdBackBillList.vue
@@ -799,7 +799,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num <0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
index a3499aa..8874e31 100644
--- a/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
+++ b/src/views/scMould/warehouse/Sc_MouldProdOutBillList.vue
@@ -831,7 +831,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/sell/sellOut/sellOutBill.vue b/src/views/sell/sellOut/sellOutBill.vue
index 9ec8708..3e02408 100644
--- a/src/views/sell/sellOut/sellOutBill.vue
+++ b/src/views/sell/sellOut/sellOutBill.vue
@@ -1040,7 +1040,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '璐存爣绛炬暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '璐存爣绛炬暟蹇呴』澶т簬0锛�'
+ if (num < 0) return '璐存爣绛炬暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
@@ -1093,7 +1093,7 @@
const num = parseInt(value)
if (isNaN(num)) return '璇疯緭鍏ユ湁鏁堢殑鏁板瓧锛�'
if (num.toString() !== value) return '鎵樻暟涓嶈兘涓哄皬鏁帮紒'
- if (num <= 0) return '鎵樻暟蹇呴』澶т簬0锛�'
+ if (num < 0) return '鎵樻暟蹇呴』澶т簬0锛�'
return true
}
}).then(({ value }) => {
diff --git a/src/views/system/user/GyDriver.vue b/src/views/system/user/GyDriver.vue
index bc60edc..c51a9cd 100644
--- a/src/views/system/user/GyDriver.vue
+++ b/src/views/system/user/GyDriver.vue
@@ -439,7 +439,9 @@
const userData = userRes.data.data[0];
this.user = sessionStorage["HUserName"] ;
this.Organization = userData.HUSEORGID;
- this.queryParams.HUSEORGID = userData.HUSEORGID;
+ const orgId = sessionStorage["OrganizationID"];
+ this.queryParams.HUSEORGID = orgId ? Number(orgId) : null;
+ this.$forceUpdate();
}
const orgRes = await axios.get(`${this.$baseUrl}/Web/GetOrganizations`);
@@ -460,7 +462,7 @@
async getList() {
this.tableShow = false;
this.loading = true;
- console.log("鑾峰彇鍒楄〃鏁版嵁...", this.sWhere);
+ this.sWhere=this.sWhere+"and 浣跨敤缁勭粐 ="+sessionStorage["OrganizationID"]
await this.set_ModCheck("GyDriver_SUPQuery")
try {
const params = {
@@ -727,7 +729,7 @@
resetQuery() {
this.queryParams = {
- HUSEORGID: this.Organization,
+ HUSEORGID: sessionStorage["OrganizationID"],
HName: "",
HNumber: "",
HSyncNumber: "",
diff --git a/src/views/system/user/GyDriverEdit.vue b/src/views/system/user/GyDriverEdit.vue
index 2079f56..341729c 100644
--- a/src/views/system/user/GyDriverEdit.vue
+++ b/src/views/system/user/GyDriverEdit.vue
@@ -99,7 +99,7 @@
v-model="formData.checkboxHStopflag"
:true-label="1"
:false-label="0"
- :disabled="!canEditStopFlag"
+ disabled
@change="handleStopFlagChange"
>
鏄惁绂佺敤
@@ -321,7 +321,7 @@
HPhone: "",
HDriverCardType: "A1",
HEmpType: "鍥哄畾",
- HStopflag: "0",
+ HStopflag: 0,
checkboxHStopflag: 0,
HRemark: "",
HUSEORGID: "",
@@ -537,10 +537,10 @@
if (data.绂佺敤鏍囪瘑) {
this.formData.checkboxHStopflag = 1;
- this.formData.HStopflag = "1";
+ this.formData.HStopflag = 1;
} else {
this.formData.checkboxHStopflag = 0;
- this.formData.HStopflag = "0";
+ this.formData.HStopflag = 0;
}
},
@@ -581,7 +581,7 @@
const sMainStr = JSON.stringify(saveData);
const res = await axios.post(`${this.$baseUrl}/Gy_Driver/AddBill1`, {
oMain: `${sMainStr};${sessionStorage.getItem("HUserName")};${
- sessionStorage.getItem("OrganizationID") || 100038
+ sessionStorage.getItem("OrganizationID")
}`,
});
@@ -639,7 +639,7 @@
handleStopFlagChange(value) {
- this.formData.HStopflag = value ? "1" : "0";
+ this.formData.HStopflag = value ? 1 : 0;
},
--
Gitblit v1.9.1