From e98c6cf658b332cd65676645301827ac03db832c Mon Sep 17 00:00:00 2001
From: 陈婷婷 <506607603@qq.com>
Date: 星期四, 02 四月 2026 17:27:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/basic/gyCurrency/gyCurrencyEdit.vue | 14 ++
src/views/component/CurrencyDialog/index.vue | 14 +-
src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue | 13 +-
src/views/sell/XsSeOutStockBill.vue | 2
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue | 18 ++-
src/views/basic/gy/gySupplier.vue | 21 ++++
src/views/basic/gyCar/gyCarEdit.vue | 1
RuoYi-Vue | 1
.env.development | 6
src/views/basic/gyCurrency/gyCurrency.vue | 9 +
src/views/login.vue | 1
src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue | 30 +++--
src/views/logistics/transportGPS/WL_YayBill.vue | 63 ++++++++++--
.env.production | 8
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue | 74 ++++++++------
15 files changed, 187 insertions(+), 88 deletions(-)
diff --git a/.env.development b/.env.development
index f6c8b8d..317b137 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/.env.production b/.env.production
index 09b7d1a..6b9d2a0 100644
--- a/.env.production
+++ b/.env.production
@@ -5,11 +5,11 @@
ENV = 'production'
# 瀹佹尝 鍥涚淮灏�
-# 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_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.1.11/API/
+# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 鏅轰簯杩堟�滾-MOM绠＄悊绯荤粺/鐢熶骇鐜
# VUE_APP_BASE_API = http://47.96.97.237/API/
#鏉滆春
diff --git a/RuoYi-Vue b/RuoYi-Vue
new file mode 160000
index 0000000..8a1cf9e
--- /dev/null
+++ b/RuoYi-Vue
@@ -0,0 +1 @@
+Subproject commit 8a1cf9ed55747229ce4149ddacf8596fa0995814
diff --git a/src/views/basic/gy/gySupplier.vue b/src/views/basic/gy/gySupplier.vue
index 3fc2c10..7ed73b7 100644
--- a/src/views/basic/gy/gySupplier.vue
+++ b/src/views/basic/gy/gySupplier.vue
@@ -360,8 +360,29 @@
created() {
this.getList()
this.getTreeselect()
+ console.log(this.treeOptions)
+ if (this.openPage) {
+ this.autoSelectCarrierTree()
+ }
},
methods: {
+ autoSelectCarrierTree() {
+ setTimeout(() => {
+ if (this.$refs.tree && this.treeOptions) {
+ // 馃憞 杩欓噷鎹㈡垚浣犵湡瀹炵殑銆愭壙杩愬晢鍒嗙被ID銆�
+ const carrierId = "1"
+
+ // 鑷姩閫変腑鑺傜偣
+ this.$refs.tree.setCurrentKey(carrierId)
+
+ // 鑷姩瑙﹀彂鑺傜偣鐐瑰嚮锛屾墽琛岀瓫閫�
+ let node = this.$refs.tree.getNode(carrierId)
+ if (node) {
+ this.handleNodeClick(node.data)
+ }
+ }
+ }, 300)
+ },
getSummaries(param) {
const { columns, data } = param;
const sums = [];
diff --git a/src/views/basic/gyCar/gyCarEdit.vue b/src/views/basic/gyCar/gyCarEdit.vue
index fb8bc03..5345abb 100644
--- a/src/views/basic/gyCar/gyCarEdit.vue
+++ b/src/views/basic/gyCar/gyCarEdit.vue
@@ -440,6 +440,7 @@
rules: {
HNumber: [{ required: true, message: "杞︾墝鍙蜂笉鑳戒负绌�", trigger: "blur" }],
HName: [{ required: true, message: "杞﹁締鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
+ HCarTypeName:[{required: true, message: "杞﹀瀷璇烽�夋嫨", trigger: "blur"}],
},
preUploadFiles: {
HCarPric: [], // 杞﹁締鐓х墖 鏂囦欢缂撳瓨(鍙繚瀛樹竴寮�)
diff --git a/src/views/basic/gyCurrency/gyCurrency.vue b/src/views/basic/gyCurrency/gyCurrency.vue
index 69f30aa..d2d4ad3 100644
--- a/src/views/basic/gyCurrency/gyCurrency.vue
+++ b/src/views/basic/gyCurrency/gyCurrency.vue
@@ -1177,12 +1177,17 @@
//鍙屽嚮琛�
handleDblclick(row, column, cell, event) {
if (this.checkIsIframe()) {
- window.parent.iframeCarCallBack(row);
+ window.parent.iframeCurrencyCallBack(row);
return;
}
this.OperationType = 3;
- this.handleEdit(row, this.OperationType);
+ if (this.openPage) {
+ this.$emit('deptEmitDb', row, 2)
+ } else {
+ this.handleEdit();
+ }
},
+
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
// this.rowForm = {}
diff --git a/src/views/basic/gyCurrency/gyCurrencyEdit.vue b/src/views/basic/gyCurrency/gyCurrencyEdit.vue
index 41c01b1..d4ae207 100644
--- a/src/views/basic/gyCurrency/gyCurrencyEdit.vue
+++ b/src/views/basic/gyCurrency/gyCurrencyEdit.vue
@@ -134,6 +134,18 @@
},
mounted() {
this.user = sessionStorage["HUserName"] || "admin";
+ this.fetchData();
+ this.getdata();
+ // 甯佸埆 鍥炶皟
+ window.iframeCurrencyCallBack = (info) => {
+ // 鍥炶皟璧嬪��
+ console.log(info);
+ this.form.HCurID = info.HItemID;
+ this.form.HCurName = info["璐у竵鍚嶇О"];
+ this.form.HExRate = info["姹囩巼"];
+ // 鍏抽棴寮圭獥
+ this.deptClose();
+ };
},
methods: {
// 妫�鏌ユ槸鍚﹀湪iframe涓�
@@ -147,6 +159,8 @@
const hID = urlParams.HInterID ? parseInt(urlParams.HInterID) : 0;
const opType = urlParams.OperationType ? parseInt(urlParams.OperationType) : 1;
+
+
// 濡傛灉props娌℃湁浼犻�掞紝浣跨敤URL鍙傛暟
const operationType = this.OperationType || opType;
const linterid = this.linterid || hID;
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
index 2f9be03..cb1b268 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillEdit.vue
@@ -86,7 +86,7 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName" required>
+ <el-form-item label="缁撶畻鏂瑰紡" prop="HSSName" >
<el-input v-model="form.HSSName" placeholder="璇烽�夋嫨缁撶畻鏂瑰紡" disabled>
<el-button
slot="append"
@@ -626,7 +626,7 @@
HCurID: [{ required: true, message: "甯佸埆涓嶈兘涓虹┖", trigger: "blur" }],
HExRate: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
HSTOCKINORGID: [{ required: true, message: "缁勭粐涓嶈兘涓虹┖", trigger: "change" }],
- HSSName: [{ required: true, message: "缁撶畻鏂瑰紡涓嶈兘涓虹┖", trigger: "blur" }],
+ // HSSName: [{ required: true, message: "缁撶畻鏂瑰紡涓嶈兘涓虹┖", trigger: "blur" }],
},
};
},
@@ -703,8 +703,8 @@
this.form.HCurName = deptRow.璐у竵鍚嶇О;
this.form.HCurID = deptRow.HItemID;
this.form.HExRate = deptRow.姹囩巼;
- this.CurrencyDialogShow = false;
- this.openData = false;
+ this.CurrencyDialogShow = false;
+ this.openData = false;
} else if (num == 3) {
console.log(deptRow);
if(this.areaType==1)
@@ -1107,6 +1107,12 @@
},
// 缂栬緫鎻愪氦淇濆瓨
submitForm() {
+ this.form.HSupID = this.form.HSupID || 0;
+ this.form.HEmpID = this.form.HEmpID || 0;
+ this.form.HDeptID = this.form.HDeptID || 0;
+ this.form.HCurID = this.form.HCurID || 0;
+ this.form.HExRate = this.form.HExRate || 1;
+ this.form.HSSID = this.form.HSSID || 0;
this.$refs["form"].validate((valid) => {
if (valid) {
let fhck = false;
@@ -1119,8 +1125,8 @@
{ field: 'HDeptID', name: '閮ㄩ棬' },
{ field: 'HCurID', name: '甯佸埆' },
{ field: 'HExRate', name: '姹囩巼' },
- { field: 'HSTOCKINORGID', name: '缁勭粐' },
- { field: 'HSSName', name: '缁撶畻鏂瑰紡' }
+ { field: 'HSTOCKINORGID', name: '缁勭粐' }
+ // { field: 'HSSName', name: '缁撶畻鏂瑰紡' }
];
for (let i = 0; i < requiredFields.length; i++) {
const field = requiredFields[i].field;
diff --git a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
index fa7b0c9..3575ea6 100644
--- a/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
+++ b/src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue
@@ -22,7 +22,7 @@
<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-button type="primary" icon="el-icon-search" @click="set_ResCnz">閲嶆柊鍚屾</el-button>
+ <!-- <el-button type="primary" icon="el-icon-search" @click="set_ResCnz">閲嶆柊鍚屾</el-button> -->
</el-form-item>
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
@@ -163,8 +163,7 @@
</el-table-column>
</template>
</el-table>
- <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes"
- @pagination="getList" />
+ <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes" @pagination="getList" />
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
@@ -258,7 +257,7 @@
queryParams: {
HBillNo: '',
HBillno2: '',
- HInitTimeCycle: 29,
+ HInitTimeCycle: 364,
HDeptID: '',
HSourceBillNo: '',
@@ -282,16 +281,17 @@
multiple: true,
// 閬僵灞�
loading: true,
+ loading: true,
tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
btList: [],//琛ㄥご鍒楄〃鏄剧ず
btResList: [],
tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
dataList: [],
titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- pageSizes: [50, 100, 500, 5000, 50000],
+ pageSizes: [ 10,50, 500, 5000, 50000],
page: 1,
pageSize: 0,
- total: 0,
+ total: 0,
};
},
created() {
@@ -373,7 +373,6 @@
this.eTime = yyyyE + '-' + mmE + '-' + ddE
},
getList() {
- this.pageSize = 50
this.tableShow = false
this.loading = true
if (this.sTime && !this.sWhere) {
@@ -393,16 +392,19 @@
if (this.pageSize == 0) {
this.pageSize = 50
}
- axios.get(this.$baseUrl + '/Cg_ContractTransportBillListController/get%EF%BB%BFList', {
+ axios.get(this.$baseUrl + '/Cg_ContractTransportBillListController/page', {
params: {
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
+ "Page":this.page,
+ "size":this.pageSize,
+ "Type":1117
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
let data1 = response.data
let option = []
- if (data1.code == 1) {
+ if (data1.list && data1.list.length > 0) {
this.btResList = data1.list//閿�鍞嚭搴撳崟鎺ュ彛琛ㄥご鏁版嵁
this.total = data1.count;
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -545,11 +547,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
diff --git a/src/views/component/CurrencyDialog/index.vue b/src/views/component/CurrencyDialog/index.vue
index 7a6a636..611c758 100644
--- a/src/views/component/CurrencyDialog/index.vue
+++ b/src/views/component/CurrencyDialog/index.vue
@@ -598,12 +598,14 @@
handleDblclick(row, column, cell, event) {
this.OperationType = 3
if (this.openPage) {
- if(this.openPage='Kf_StockOutRequestBill')
- {
- this.$emit('deptEmitDb', row, 10)
- }
- else
- this.$emit('deptEmitDb', row, 2)
+ if(this.openPage == 'Kf_StockOutRequestBill'){
+ this.$emit('deptEmitDb', row, 10)
+ this.closeDialog();
+ }
+ else{
+ this.$emit('deptEmitDb', row, 2)
+ this.closeDialog();
+ }
} else {
this.handleEdit();
}
diff --git a/src/views/login.vue b/src/views/login.vue
index 07ec6b8..9e3caf7 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -210,6 +210,7 @@
this.$router.push({ path: this.redirect || "/" }).catch(() => { })
}).catch(() => {
this.loading = false
+ this.$message.error('璐﹀彿鎴栧瘑鐮侀敊璇紝璇烽噸鏂拌緭鍏�')
if (this.captchaEnabled) {
this.getCode()
}
diff --git a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
index 6607205..823fcfc 100644
--- a/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -46,16 +46,6 @@
</el-input>
</el-form-item>
</el-col> -->
- <el-col :span="6">
- <el-form-item label="甯佸埆" prop="HCurName">
- <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="姹囩巼" prop="HExRate">
- <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" readonly />
- </el-form-item>
- </el-col>
</el-row>
</div>
@@ -243,6 +233,16 @@
<el-col :span="6">
<el-form-item label="杩愯垂" prop="HMoney">
<el-input v-model="form.HMoney" placeholder="璇疯緭鍏ヨ繍璐�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="甯佸埆" prop="HCurName">
+ <el-input v-model="form.HCurName" placeholder="璇疯緭鍏ュ竵鍒�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="姹囩巼" prop="HExRate">
+ <el-input v-model="form.HExRate" placeholder="璇疯緭鍏ユ眹鐜�" readonly />
</el-form-item>
</el-col>
</el-row>
@@ -434,7 +434,7 @@
@selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column align="center" label="搴忓彿" type="index" width="80" />
- <el-table-column align="center" label="婧愬崟鍗曟嵁鍙�" width="120">
+ <el-table-column align="center" label="鍙戣揣閫氱煡鍗�" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HSourceBillNo }}</span>
</template>
@@ -456,21 +456,19 @@
<el-table-column align="center" label="鐗╂枡鍚嶇О" width="120">
<template slot-scope="scope">{{ scope.row.HMaterName }} </template>
</el-table-column>
- <el-table-column align="center" label="瀹瑰櫒浠ｇ爜" width="120">
+ <el-table-column align="center" label="鐗╂枡瑙勬牸" width="120">
+ <template slot-scope="scope">{{ scope.row.HModel }} </template>
+ </el-table-column>
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒浠ｇ爜" width="120">
<template slot-scope="scope">
<el-input v-model="scope.row.HMouldNumber" placeholder="璇疯緭鍏ュ櫒鍏蜂唬鐮�"
@keyup.native.f7="openDataDialog(17, scope.row)"
@dblclick.native="openDataDialog(17, scope.row)" />
</template>
</el-table-column>
- <el-table-column align="center" label="瀹瑰櫒鍚嶇О" width="120">
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒鍚嶇О" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMouldName }}</span>
- </template>
- </el-table-column>
- <el-table-column align="center" label="瀹瑰櫒鏁伴噺/鎵�" width="120">
- <template slot-scope="scope">
- <span>{{ scope.row.HStandardQtyForMouldInPack }}</span>
</template>
</el-table-column>
@@ -481,25 +479,30 @@
@change="checkTotalQtyExceed(scope.row)"></el-input-number>
</template>
</el-table-column>
- <el-table-column align="center" label="鏍囧噯鍖呰鏁伴噺" width="120">
+ <el-table-column v-if="false" align="center" label="鏍囧噯鍖呰鏁伴噺" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HSNP }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="鍖呰瀹瑰櫒鏁伴噺" width="120">
+ <el-table-column v-if="false" align="center" label="鍖呰瀹瑰櫒鏁伴噺" width="170">
<template slot-scope="scope">
- <el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 90px;"
+ <el-input-number v-model="scope.row.HMouldQty" :min="0" style="width: 150px;"
controls-position="right"
@change="changeHMouldQty(scope.row)"></el-input-number>
</template>
</el-table-column>
- <el-table-column align="center" label="鎵樻暟" width="120">
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒鏁伴噺/鎵�" width="120">
+ <template slot-scope="scope">
+ <span>{{ scope.row.HStandardQtyForMouldInPack }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column v-if="false" align="center" label="鎵樻暟" width="120">
<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>
</template>
</el-table-column>
- <el-table-column align="center" label="鎵樺崟浣嶄綋绉�" width="120">
+ <el-table-column v-if="false" align="center" label="鎵樺崟浣嶄綋绉�" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HPackV }}</span>
</template>
@@ -516,22 +519,22 @@
controls-position="right"></el-input-number> -->
</template>
</el-table-column>
- <el-table-column align="center" label="瀹瑰櫒闀垮害" width="120">
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒闀垮害" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMouldLength }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="瀹瑰櫒瀹藉害" width="120">
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒瀹藉害" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMouldWidth }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="瀹瑰櫒楂樺害" width="120">
+ <el-table-column v-if="false" align="center" label="瀹瑰櫒楂樺害" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMouldHeight }}</span>
</template>
</el-table-column>
- <el-table-column align="center" label="鎶樺彔楂樺害" width="120">
+ <el-table-column v-if="false" align="center" label="鎶樺彔楂樺害" width="120">
<template slot-scope="scope">
<span>{{ scope.row.HMouldFoldHeight }}</span>
</template>
@@ -658,17 +661,17 @@
HCusName: [
{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }
],
- HBeginAddrName: [
- { required: true, message: "濮嬪彂鍦颁笉鑳戒负绌�", trigger: "blur" }
- ],
- HEndAddrName: [
- { required: true, message: "鐩殑鍦颁笉鑳戒负绌�", trigger: "blur" }
+ HCarTypeName:[
+ { required: true, message: "杞﹀瀷涓嶈兘涓虹┖", trigger: "blur" }
],
HDate: [
{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }
],
HExRate: [
{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ HCarrierName: [
+ { required: true, message: "鎵胯繍鍚堝悓涓嶈兘涓虹┖", trigger: "blur" }
]
},
@@ -946,7 +949,10 @@
"HQty": result.data[i].鐗╂枡鏁伴噺,
"HQty_origin": result.data[i].HQty,
"HVolume": rowVolume,
- "HScatteredVolume": result.data[i].闆跺崟鍗犵敤浣撶Н
+ "HScatteredVolume": result.data[i].闆跺崟鍗犵敤浣撶Н,
+ "HStandardQtyForMouldInPack":result.data[i].HStandardQtyForMouldInPack,
+ "HPackV":result.data[i].HPackV,
+ "HPackQTY":result.data[i].HPackQTY,
}
)
}
@@ -1371,6 +1377,7 @@
"HMouldWidth": res[j].瀹藉害,
"HMouldHeight": res[j].楂樺害,
"HMouldFoldHeight": res[j].鎶樺彔楂樺害,
+ "HModel":res[j].鐗╂枡瑙勬牸,
"HQty": res[j].鐗╂枡鏁伴噺,
"HQty_origin": orginHQTY,
"HMouldQty": mouldQty,
@@ -1433,6 +1440,7 @@
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
+ this.form.HCarryStatus = 0;
var loadingRate = this.form.HLoadingRate;
if (loadingRate && typeof loadingRate === 'string') {
this.form.HLoadingRate = parseFloat(loadingRate.replace('%', '')) / 100;
diff --git a/src/views/logistics/transportGPS/WL_YayBill.vue b/src/views/logistics/transportGPS/WL_YayBill.vue
index 9f0d567..6b42ca1 100644
--- a/src/views/logistics/transportGPS/WL_YayBill.vue
+++ b/src/views/logistics/transportGPS/WL_YayBill.vue
@@ -24,6 +24,17 @@
<el-input v-model="queryParams.HPlateNumber" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keyup.enter.native="handleQuery"
style="width: 120px;" />
</el-form-item>
+ <el-form-item label="鍙戣揣閫氱煡鍗�" prop="HSourceBillNo">
+ <el-input v-model="queryParams.HSourceBillNo" placeholder="璇疯緭鍏ュ彂璐ч�氱煡鍗�" @keyup.enter.native="handleQuery"
+ style="width: 120px;" />
+ </el-form-item>
+ <el-form-item label="鐗╂祦鐘舵��" prop="HBillStatus">
+ <el-select v-model="queryParams.HBillStatus" placeholder="璇烽�夋嫨鐗╂祦鐘舵��">
+ <el-option v-for="(item, index) in HBillStatusList" :key="index" :label="item.Name"
+ :value="item.Name">
+ </el-option>
+ </el-select>
+ </el-form-item>
<el-form-item label="缁勭粐" prop="HOrgID">
<el-select v-model="queryParams.HOrgID" placeholder="璇烽�夋嫨缁勭粐">
@@ -256,8 +267,9 @@
</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"
+ @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" />
@@ -432,7 +444,17 @@
copyType: 0, //澶嶅埗鏍囪銆傛墦寮�缂栬緫缁勪欢鏃讹紝鐢ㄤ簬鍖哄垎缂栬緫杩樻槸澶嶅埗
HInterID: null,
hPriceTypeList: ['鎴愭湰浠�', '缁撶畻浠�'],
-
+ HBillStatusList:[
+ {ID: 1, Name: "鐢宠涓�" },
+ {ID: 2, Name: "寰呬緵搴斿晢纭" },
+ {ID: 3, Name: "鎸囧畾椹鹃┒鍛樸�佽溅杈嗕腑" },
+ {ID: 4, Name: "姝ｅ湪鍓嶅線濮嬪彂鍦�" },
+ {ID: 5, Name: "鎻愯揣涓�" },
+ {ID: 6, Name: "鍑嗗绂诲巶" },
+ {ID: 7, Name: "閫佽揣涓�" },
+ {ID: 8, Name: "宸茬鏀�" },
+ {ID: 9, Name: "宸叉牳绠�" },
+ ],
rqsgList: [ //鏃ユ湡闂撮殧涓嬫媺鍒楄〃鏁版嵁
{ label: '浠婂ぉ', value: 0 },
{ label: '杩戜袱澶�', value: 1 },
@@ -519,6 +541,8 @@
HBillNo: '',
HPlateNumber: '',
HInitTimeCycle: 29,
+ HSourceBillNo:'',
+ HBillStatus:'',
sTime: '',
eTime: '',
HOrgID: sessionStorage["OrganizationID"] - 0,
@@ -535,6 +559,14 @@
ColContent2: '',
ColContent: '',
},
+ loading: true,
+ tyResList: [],//鍒楄〃锛堟帴鍙ｆ暟鎹級
+ btList: [],//琛ㄥご鍒楄〃鏄剧ず
+ btResList: [],
+ tableData: [],//鍒楄〃(鍒嗛〉鏄剧ず)
+ dataList: [],
+ titleData: [],//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ pageSizes: [ 50,100, 500, 5000, 50000],
page: 1, //page椤电储寮�
pageSize: 0, //page椤甸潰璁板綍鏁�
total: 0, //璁板綍鍚堣鏁�
@@ -749,6 +781,12 @@
if (this.queryParams.HPlateNumber) {
this.sWhere += " and 杞︾墝鍙� like '%" + this.queryParams.HPlateNumber + "%'";
}
+ if (this.queryParams.HSourceBillNo) {
+ this.sWhere += " and 鍙戣揣閫氱煡鍗曞彿 like '%" + this.queryParams.HSourceBillNo + "%'";
+ }
+ if (this.queryParams.HBillStatus) {
+ this.sWhere += " and 鐗╂祦鐘舵�� like '%" + this.queryParams.HBillStatus + "%'";
+ }
// if (this.queryParams.HOrgID) {
// this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
@@ -761,7 +799,7 @@
//#region 鏌ヨ
getList() {
- this.pageSize = 50
+
if (this.pageSize == 0) {
this.pageSize = 50
}
@@ -769,18 +807,19 @@
this.loading = true
console.log("swhere", this.sWhere)
// 鍒楄〃鏌ヨ
- axios.get(this.$baseUrl + '/WLYayBillController/GetListPage', {
+ axios.get(this.$baseUrl + '/WLYayBillController/page', {
params: {
"sWhere": this.sWhere,
"user": sessionStorage["HUserName"],
"page": this.page,
- "size": this.pageSize
+ "size": this.pageSize,
+ "Type":3321
},
}).then(response => {
this.tyResList = response.data.data//鎬绘暟鎹�
let data1 = response.data
let option = []
- if (data1.code == 1) {
+ if (data1.list && data1.list.length > 0) {
this.btResList = data1.list //鍒楄〃琛ㄥご鏁版嵁
this.total = data1.count;
var data = [];//鍒楀瓧娈垫暟鎹�
@@ -1231,11 +1270,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
diff --git a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
index c76e1b7..8bb8a14 100644
--- a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
@@ -168,13 +168,12 @@
@change="riqiChange"
class="ForFilteringSchemes"
>
- <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-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">
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 51a8e45..b0f12f8 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -696,7 +696,7 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
- if (this.openPage && this.propsHOrgID) {
+ if (this.openPage && this.propsHOrgID && this.queryParams.HOrgID == "" ) {
this.queryParams.HOrgID = this.propsHOrgID
}
// this.queryParams.HOrgID = 100038
--
Gitblit v1.9.1