From a0010bcabbfbc3771aa05d54094f5d02bcdd5609 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 15 十二月 2025 08:42:50 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue | 55 +
src/views/component/BarCodeDetail/index.vue | 34
src/views/component/CurrencyDialog/index.vue | 104 ++--
src/views/gyMaterial/GyMaterialCorrection.vue | 130 ++--
src/views/component/SettleStyleDialog/index.vue | 116 ++--
src/views/component/CustomerTypeDialog/index.vue | 132 ++--
public/static/grf/库位码.grf | 61 ++
src/views/gyStockPlace/edit/index.vue | 2
src/views/FbStepFoldinBillList/fbStepFoldinBillListEdit.vue | 28
src/views/basic/gyProperty/gyPropertyList.vue | 4
src/views/component/printList/barcode.vue | 143 +++++
src/views/GyCustomer/CustomerEdit/index.vue | 160 +++---
src/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit.vue | 28
src/views/FbStepFoldinBillList/EmployeeDialog.vue | 18
src/views/component/printList/hBarPlanPrint.vue | 175 ++++---
src/views/component/AreaDialog/index.vue | 94 +-
src/views/gyEmployee/index.vue | 2
src/router/index.js | 31
src/views/component/PackStockDetail/index.vue | 30
src/views/component/printList/index.vue | 5
src/views/GyCustomer/index.vue | 6
src/views/ICMO/ScICMOReportBill/ScICMOReportBillEdit.vue | 10
src/views/gyEmployee/edit/index.vue | 2
package.json | 1
src/views/FbStepFoldinBillList/SupplierDialog.vue | 22
src/views/gyWarehouse/edit/index.vue | 2
src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue | 8
src/App.vue | 1
28 files changed, 833 insertions(+), 571 deletions(-)
diff --git a/package.json b/package.json
index bb43bd1..1db4057 100644
--- a/package.json
+++ b/package.json
@@ -39,6 +39,7 @@
"jsencrypt": "3.0.0-rc.1",
"moment": "^2.30.1",
"nprogress": "0.2.0",
+ "print-js": "^1.6.0",
"quill": "2.0.2",
"screenfull": "5.0.2",
"sortablejs": "^1.10.2",
diff --git "a/public/static/grf/\345\272\223\344\275\215\347\240\201.grf" "b/public/static/grf/\345\272\223\344\275\215\347\240\201.grf"
index d505d0e..4881d2d 100644
--- "a/public/static/grf/\345\272\223\344\275\215\347\240\201.grf"
+++ "b/public/static/grf/\345\272\223\344\275\215\347\240\201.grf"
@@ -1,5 +1,5 @@
锘縶
- "Version":"6.8.2.2",
+ "Version":"6.8.9.5",
"Title":"1a.绠�鍗曡〃鏍�",
"Author":"閿愭氮鎶ヨ〃杞欢",
"Description":"婕旂ず涓�涓渶鍩烘湰鐨勫垪琛ㄦ姤琛ㄣ��",
@@ -22,11 +22,18 @@
"CenterView":true,
"PrintAdaptMethod":"ResizeToFit",
"Recordset":{
- "ConnectionString":"xml",
- "QuerySQL":"閿�鍞嚭搴撳崟.txt",
"Field":[
{
- "Name":"鏉＄爜缂栧彿"
+ "Name":"鏉＄爜缂栧彿1"
+ },
+ {
+ "Name":"鏉＄爜缂栧彿2"
+ },
+ {
+ "Name":"浠撲綅鍚嶇О1"
+ },
+ {
+ "Name":"浠撲綅鍚嶇О2"
}
]
},
@@ -37,7 +44,7 @@
}
],
"ColumnContent":{
- "Height":3.41313,
+ "Height":5.60917,
"ColumnContentCell":[
{
"Column":"鍗曟嵁鍙�",
@@ -49,17 +56,49 @@
"Left":0.396875,
"Top":0.211667,
"Width":8.20208,
- "Height":2.98979
+ "Height":5.18583
},
{
"Type":"Barcode",
"Name":"Barcode1",
- "Left":0.211667,
- "Top":0.396875,
- "Width":4.39208,
- "Height":2.59292,
+ "Left":-0.370417,
+ "Top":0.79375,
+ "Width":5.52979,
+ "Height":3.59833,
"BarcodeType":"QRCode",
- "Text":"[#鏉＄爜缂栧彿#]"
+ "CaptionPosition":"None",
+ "Text":"[#鏉＄爜缂栧彿1#]"
+ },
+ {
+ "Type":"Barcode",
+ "Name":"Barcode2",
+ "Left":4.04813,
+ "Top":0.79375,
+ "Width":5.13292,
+ "Height":3.59833,
+ "BarcodeType":"QRCode",
+ "CaptionPosition":"None",
+ "Text":"[#鏉＄爜缂栧彿2#]"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox1",
+ "Left":0.608542,
+ "Top":4.60375,
+ "Width":3.59833,
+ "Height":0.608542,
+ "TextAlign":"MiddleCenter",
+ "DataField":"浠撲綅鍚嶇О1"
+ },
+ {
+ "Type":"FieldBox",
+ "Name":"FieldBox2",
+ "Left":4.78896,
+ "Top":4.60375,
+ "Width":3.59833,
+ "Height":0.608542,
+ "TextAlign":"MiddleCenter",
+ "DataField":"浠撲綅鍚嶇О2"
}
]
}
diff --git a/src/App.vue b/src/App.vue
index 12df51d..e63cdde 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -7,6 +7,7 @@
<script>
import ThemePicker from "@/components/ThemePicker"
+require("@/utils/grhtml5-6.8-min");
export default {
name: "App",
diff --git a/src/router/index.js b/src/router/index.js
index 65a99ba..e3019be 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -523,7 +523,7 @@
title: "閲囪喘閫�鏂欏崟鍒楄〃锛堝凡鍏ュ簱锛�",
activeMenu: "purchase/postockInBack",
},
- }
+ },
],
},
//#endregion
@@ -812,7 +812,7 @@
},
],
},
- //#endregion
+ //#endregion
//#region 鍣ㄥ叿涓绘。
{
@@ -862,7 +862,7 @@
],
},
//#endregion
- //#endregion
+ //#endregion
//#region 鍣ㄥ叿浠撳瓨绠＄悊
//#region 鍣ㄥ叿棰嗙敤鐢宠鍗曞垪琛�
@@ -886,7 +886,7 @@
},
],
},
- //#endregion
+ //#endregion
//#region 鍣ㄥ叿棰嗙敤鐢宠鍗�
{
@@ -997,7 +997,7 @@
},
],
},
- //#endregion
+ //#endregion
//#region 鍣ㄥ叿棰嗙敤閫�搴撳崟鍒楄〃
{
@@ -1132,7 +1132,7 @@
},
],
},
- //#endregion
+ //#endregion
//#endregion
//#endregion
@@ -1199,7 +1199,7 @@
},
],
},
- //#endregion
+ //#endregion
//#endregion
//#region OA鍩虹璧勬枡
@@ -1432,7 +1432,8 @@
children: [
{
path: "/basic/gy/gyCartypelist",
- component: () => import("@/views/basic/gyCartypelist/gyCartypelist.vue"),
+ component: () =>
+ import("@/views/basic/gyCartypelist/gyCartypelist.vue"),
name: "GyCartype",
meta: { title: "杞﹀瀷鍒楄〃", activeMenu: "basic/gy" },
},
@@ -1471,7 +1472,8 @@
//#region 璐圭敤鍩虹璧勬枡
//#region 璐圭敤椤圭洰鍒楄〃
- {//src\views\basic\gyItemMoney\gyItemMoney.vue
+ {
+ //src\views\basic\gyItemMoney\gyItemMoney.vue
path: "/basic/gy/gyItemMoney",
component: Layout,
hidden: true,
@@ -1491,9 +1493,10 @@
},
//#endregion
//#endregion
-
+
//#region 杈呭姪灞炴�у熀纭�璧勬枡
- {//src\views\basic\gyItemMoney\gyItemMoney.vue
+ {
+ //src\views\basic\gyItemMoney\gyItemMoney.vue
path: "/basic",
component: Layout,
hidden: true,
@@ -1530,6 +1533,12 @@
component: () => import("@/views/component/printList/hBarPlanPrint"),
hidden: true,
},
+ //#region 鎵撳嵃鍒楄〃(缃戦〉)
+ {
+ path: "/hBarPlanPrintWeb",
+ component: () => import("@/views/component/printList/barcode.vue"),
+ hidden: true,
+ },
//#endregion
//#endregion
//#endregion
diff --git a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit.vue b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit.vue
index 9d5d3cc..60a8031 100644
--- a/src/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit.vue
+++ b/src/views/FbStepFoldOutBillList/fbStepFoldOutBillListEdit.vue
@@ -101,7 +101,7 @@
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="楠屾敹">
- <el-input v-model="form.HSecManagerName" placeholder="楠屾敹" style="width: calc(100% - 50px)" />
+ <el-input v-model="form.HSecManagerName" placeholder="楠屾敹" style="width: calc(100% - 50px)" />
<el-button type="primary" icon="el-icon-search" @click="showEmployeeDialog('inspector')">
</el-button>
</el-form-item>
@@ -382,7 +382,7 @@
:dialog-type="currentDialogType"
:dialog-title="employeeDialogTitle"
@select="handleEmployeeSelect"
- />
+ />
</div>
</template>
@@ -504,7 +504,7 @@
}
],
selectedRows: [],
- baseURL: process.env.VUE_APP_BASE_URL || 'http://47.96.97.237/API/'
+ baseURL: process.env.VUE_APP_BASE_API || 'http://47.96.97.237/API/'
}
},
computed: {
@@ -815,7 +815,7 @@
}
console.log(`閫夋嫨鐨�${type}:`, data)
},
-
+
handleSupplierSelect(data, type) {
this.form.HSupID = data.HItemID
@@ -823,7 +823,7 @@
console.log('閫夋嫨鐨勪緵搴斿晢:', data)
},
-
+
// 琛ㄦ牸鎿嶄綔
handleAddLine() {
this.tableData.push({
@@ -898,11 +898,11 @@
}
// 纭繚琛ㄦ牸鏁版嵁涓殑浠撳簱ID涔熸湁鍊�
- const hasValidTableData = this.tableData.every(row =>
- row.HMaterID && row.HMaterID !== 0 &&
+ const hasValidTableData = this.tableData.every(row =>
+ row.HMaterID && row.HMaterID !== 0 &&
row.HUnitID && row.HUnitID !== 0
)
-
+
if (!hasValidTableData) {
// this.$message.error('璇峰畬鍠勮〃鏍间腑鐨勭墿鏂欏拰鍗曚綅淇℃伅')
// return
@@ -919,14 +919,14 @@
// })
// }
//const formData=JSON.stringify(this.form)+';'+JSON.stringify(this.tableData)+';'+this.operationType+';'+(sessionStorage['HUserName'] || 'admin');
- const submitData =
- JSON.stringify(this.form) + ';' +
- JSON.stringify(this.tableData) + ';' +
- this.operationType + ';' +
+ const submitData =
+ JSON.stringify(this.form) + ';' +
+ JSON.stringify(this.tableData) + ';' +
+ this.operationType + ';' +
(sessionStorage['HUserName'] || 'admin') + ';' +
JSON.stringify({ main: this.form, table: this.tableData })
console.log('鎻愪氦鐨勫畬鏁存暟鎹�:', submitData)
-
+
const response = await axios.post(`${this.baseURL}/Kf_StepFoldOutBill/Kf_StepFoldOutBillEdit`, {
sMainSub: submitData
})
@@ -1004,4 +1004,4 @@
.el-input-number {
width: 100%;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/FbStepFoldinBillList/EmployeeDialog.vue b/src/views/FbStepFoldinBillList/EmployeeDialog.vue
index 7b07a3b..572a0ec 100644
--- a/src/views/FbStepFoldinBillList/EmployeeDialog.vue
+++ b/src/views/FbStepFoldinBillList/EmployeeDialog.vue
@@ -260,7 +260,7 @@
selectedRows: [],
currentFilterName: '',
activeCollapse: ['more'],
- baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/"
+ baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/"
}
},
watch: {
@@ -318,11 +318,11 @@
}
console.log('璇锋眰鍙傛暟:', requestParams)
const response = await axios.get(`${this.baseURL}/Gy_Employee/list`, { params: requestParams })
-
+
if (response.data.count === 1) {
this.tableData = response.data.data || []
this.total = response.data.count || 0
-
+
if (response.data.list.length > 0) {
this.setTableColumns(response.data.list)
}
@@ -431,11 +431,11 @@
return ` and ${col} ${com}`
}
- if (q.ColName && q.Comparator && q.Comparator !== '0' && q.ColContent)
+ if (q.ColName && q.Comparator && q.Comparator !== '0' && q.ColContent)
sWhereParts.push(buildComparator(q.ColName, q.Comparator, q.ColContent))
- if (q.ColName1 && q.Comparator1 && q.Comparator1 !== '0' && q.ColContent1)
+ if (q.ColName1 && q.Comparator1 && q.Comparator1 !== '0' && q.ColContent1)
sWhereParts.push(buildComparator(q.ColName1, q.Comparator1, q.ColContent1))
- if (q.ColName2 && q.Comparator2 && q.Comparator2 !== '0' && q.ColContent2)
+ if (q.ColName2 && q.Comparator2 && q.Comparator2 !== '0' && q.ColContent2)
sWhereParts.push(buildComparator(q.ColName2, q.Comparator2, q.ColContent2))
if (q.HNumber) sWhereParts.push(` and 鑱屽憳浠ｇ爜 like '%${q.HNumber}%'`)
@@ -488,7 +488,7 @@
this.getEmployeeList(this.buildWhereClause())
},
-
+
handleConfirm() {
if (this.selectedRows.length === 0) {
this.$message.warning('璇烽�夋嫨鑱屽憳')
@@ -500,7 +500,7 @@
this.$emit('update:visible', false)
},
-
+
handleCancel() {
this.$emit('update:visible', false)
},
@@ -543,4 +543,4 @@
::v-deep .el-table .cell {
padding: 8px 12px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/FbStepFoldinBillList/SupplierDialog.vue b/src/views/FbStepFoldinBillList/SupplierDialog.vue
index 7246adc..e88df1a 100644
--- a/src/views/FbStepFoldinBillList/SupplierDialog.vue
+++ b/src/views/FbStepFoldinBillList/SupplierDialog.vue
@@ -252,12 +252,12 @@
},
dialogType: {
type: String,
- default: 'supplier'
+ default: 'supplier'
}
},
data() {
return {
-
+
isVisible: this.visible,
dialogTitle: '閫夋嫨渚涘簲鍟�',
queryForm: {
@@ -290,7 +290,7 @@
selectedRows: [],
currentFilterName: '',
activeCollapse: ['more'],
- baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/"
+ baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/"
}
},
watch: {
@@ -300,7 +300,7 @@
this.initDialog()
}
},
-
+
isVisible(val) {
this.$emit('update:visible', val)
}
@@ -320,7 +320,7 @@
if (response.data.count === 1) {
this.organizations = response.data.data
// 璁剧疆榛樿缁勭粐
- const defaultOrg = sessionStorage.getItem('Organization') ||
+ const defaultOrg = sessionStorage.getItem('Organization') ||
sessionStorage.getItem('OrganizationID')
if (defaultOrg) {
this.queryForm.HUSEORGID = defaultOrg
@@ -357,11 +357,11 @@
}
console.log('璇锋眰鍙傛暟:', params)
const response = await axios.get(`${this.baseURL}/Gy_Supplier/page`, { params })
-
+
if (response.data.code == 1) {
this.tableData = response.data.data || []
this.total = response.data.count || 0
-
+
if ( response.data.list.length > 0) {
this.setTableColumns(response.data.list)
}
@@ -451,11 +451,11 @@
}
// 娣诲姞杩囨护鏉′欢
- if (q.ColName && q.Comparator && q.Comparator !== '0' && q.ColContent)
+ if (q.ColName && q.Comparator && q.Comparator !== '0' && q.ColContent)
sWhereParts.push(buildComparator(q.ColName, q.Comparator, q.ColContent))
- if (q.ColName1 && q.Comparator1 && q.Comparator1 !== '0' && q.ColContent1)
+ if (q.ColName1 && q.Comparator1 && q.Comparator1 !== '0' && q.ColContent1)
sWhereParts.push(buildComparator(q.ColName1, q.Comparator1, q.ColContent1))
- if (q.ColName2 && q.Comparator2 && q.Comparator2 !== '0' && q.ColContent2)
+ if (q.ColName2 && q.Comparator2 && q.Comparator2 !== '0' && q.ColContent2)
sWhereParts.push(buildComparator(q.ColName2, q.Comparator2, q.ColContent2))
// 娣诲姞鍩烘湰鏌ヨ鏉′欢
@@ -591,4 +591,4 @@
.dialog-footer {
text-align: right;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/FbStepFoldinBillList/fbStepFoldinBillListEdit.vue b/src/views/FbStepFoldinBillList/fbStepFoldinBillListEdit.vue
index 5eea970..59179d6 100644
--- a/src/views/FbStepFoldinBillList/fbStepFoldinBillListEdit.vue
+++ b/src/views/FbStepFoldinBillList/fbStepFoldinBillListEdit.vue
@@ -101,7 +101,7 @@
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="楠屾敹">
- <el-input v-model="form.HSecManagerName" placeholder="楠屾敹" style="width: calc(100% - 50px)" />
+ <el-input v-model="form.HSecManagerName" placeholder="楠屾敹" style="width: calc(100% - 50px)" />
<el-button type="primary" icon="el-icon-search" @click="showEmployeeDialog('inspector')">
</el-button>
</el-form-item>
@@ -382,7 +382,7 @@
:dialog-type="currentDialogType"
:dialog-title="employeeDialogTitle"
@select="handleEmployeeSelect"
- />
+ />
</div>
</template>
@@ -504,7 +504,7 @@
}
],
selectedRows: [],
- baseURL: process.env.VUE_APP_BASE_URL || 'http://47.96.97.237/API/'
+ baseURL: process.env.VUE_APP_BASE_API || 'http://47.96.97.237/API/'
}
},
computed: {
@@ -815,7 +815,7 @@
}
console.log(`閫夋嫨鐨�${type}:`, data)
},
-
+
handleSupplierSelect(data, type) {
this.form.HSupID = data.HItemID
@@ -823,7 +823,7 @@
console.log('閫夋嫨鐨勪緵搴斿晢:', data)
},
-
+
// 琛ㄦ牸鎿嶄綔
handleAddLine() {
this.tableData.push({
@@ -898,11 +898,11 @@
}
// 纭繚琛ㄦ牸鏁版嵁涓殑浠撳簱ID涔熸湁鍊�
- const hasValidTableData = this.tableData.every(row =>
- row.HMaterID && row.HMaterID !== 0 &&
+ const hasValidTableData = this.tableData.every(row =>
+ row.HMaterID && row.HMaterID !== 0 &&
row.HUnitID && row.HUnitID !== 0
)
-
+
if (!hasValidTableData) {
// this.$message.error('璇峰畬鍠勮〃鏍间腑鐨勭墿鏂欏拰鍗曚綅淇℃伅')
// return
@@ -919,14 +919,14 @@
// })
// }
//const formData=JSON.stringify(this.form)+';'+JSON.stringify(this.tableData)+';'+this.operationType+';'+(sessionStorage['HUserName'] || 'admin');
- const submitData =
- JSON.stringify(this.form) + ';' +
- JSON.stringify(this.tableData) + ';' +
- this.operationType + ';' +
+ const submitData =
+ JSON.stringify(this.form) + ';' +
+ JSON.stringify(this.tableData) + ';' +
+ this.operationType + ';' +
(sessionStorage['HUserName'] || 'admin') + ';' +
JSON.stringify({ main: this.form, table: this.tableData })
console.log('鎻愪氦鐨勫畬鏁存暟鎹�:', submitData)
-
+
const response = await axios.post(`${this.baseURL}/Kf_StepFoldInBill/Kf_StepFoldInBillEdit`, {
sMainSub: submitData
})
@@ -1004,4 +1004,4 @@
.el-input-number {
width: 100%;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/GyCustomer/CustomerEdit/index.vue b/src/views/GyCustomer/CustomerEdit/index.vue
index 6433895..5c5c5c0 100644
--- a/src/views/GyCustomer/CustomerEdit/index.vue
+++ b/src/views/GyCustomer/CustomerEdit/index.vue
@@ -23,15 +23,15 @@
<el-card>
<div class="card-body">
<h1 style="text-align:center;margin-bottom:20px;"><b>瀹㈡埛璧勬枡</b></h1>
-
+
<el-tabs v-model="activeTab" type="card">
<el-tab-pane label="鍩烘湰淇℃伅" name="basic">
<el-form ref="form" :model="formData" label-width="100px" :rules="rules">
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="瀹㈡埛浠ｇ爜" prop="HNumber">
- <el-input
- v-model="formData.HNumber"
+ <el-input
+ v-model="formData.HNumber"
placeholder="璇疯緭鍏ュ鎴蜂唬鐮�"
:readonly="operationType === 3"
></el-input>
@@ -78,8 +78,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="鍒涘缓缁勭粐" prop="HCreateOrgID">
- <el-select
- v-model="formData.HCreateOrgID"
+ <el-select
+ v-model="formData.HCreateOrgID"
placeholder="璇烽�夋嫨鍒涘缓缁勭粐"
:disabled="operationType !== 1"
style="width: 100%"
@@ -98,8 +98,8 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="浣跨敤缁勭粐" prop="HUSEORGID">
- <el-select
- v-model="formData.HUSEORGID"
+ <el-select
+ v-model="formData.HUSEORGID"
placeholder="璇烽�夋嫨浣跨敤缁勭粐"
:disabled="operationType !== 1"
style="width: 100%"
@@ -117,7 +117,7 @@
</el-form>
</el-tab-pane>
-
+
<el-tab-pane label="鍏朵粬淇℃伅" name="other">
<el-form ref="formOther" :model="formData" :rules="rules" label-width="100px">
<el-row :gutter="20">
@@ -221,16 +221,16 @@
</el-col>
<el-col :span="12">
<el-form-item label="鍦板尯" prop="HAreaID">
- <el-input
- v-model="formData.HAreaName"
+ <el-input
+ v-model="formData.HAreaName"
placeholder="璇烽�夋嫨鍦板尯"
readonly
style="width: calc(100% - 50px)"
>
</el-input>
- <el-button
- type="primary"
- icon="el-icon-search"
+ <el-button
+ type="primary"
+ icon="el-icon-search"
style="margin-left: 10px;"
@click="openAreaDialog"
></el-button>
@@ -242,16 +242,16 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="榛樿璐у竵">
- <el-input
- v-model="formData.HCurName"
+ <el-input
+ v-model="formData.HCurName"
placeholder="璇烽�夋嫨榛樿璐у竵"
readonly
style="width: calc(100% - 50px)"
>
</el-input>
- <el-button
- type="primary"
- icon="el-icon-search"
+ <el-button
+ type="primary"
+ icon="el-icon-search"
style="margin-left: 10px;"
@click="openCurrencyDialog"
></el-button>
@@ -260,16 +260,16 @@
</el-col>
<el-col :span="12">
<el-form-item label="缁撶畻鏂瑰紡">
- <el-input
- v-model="formData.HSSName"
+ <el-input
+ v-model="formData.HSSName"
placeholder="璇烽�夋嫨缁撶畻鏂瑰紡"
readonly
style="width: calc(100% - 50px)"
>
</el-input>
- <el-button
- type="primary"
- icon="el-icon-search"
+ <el-button
+ type="primary"
+ icon="el-icon-search"
style="margin-left: 10px;"
@click="openSettleStyleDialog"
></el-button>
@@ -292,16 +292,16 @@
</el-col>
<el-col :span="12">
<el-form-item label="瀹㈡埛鍒嗙被">
- <el-input
- v-model="formData.HCusTypeName"
+ <el-input
+ v-model="formData.HCusTypeName"
placeholder="璇烽�夋嫨瀹㈡埛鍒嗙被"
readonly
style="width: calc(100% - 50px)"
>
</el-input>
- <el-button
- type="primary"
- icon="el-icon-search"
+ <el-button
+ type="primary"
+ icon="el-icon-search"
style="margin-left: 10px;"
@click="openCustomerTypeDialog"
></el-button>
@@ -372,28 +372,28 @@
</el-card>
</div>
-
+
<!-- 鍦板尯tanchuang -->
- <AreaDialog
+ <AreaDialog
:visible.sync="areaDialogVisible"
@selected="handleAreaSelected"
/>
-
-
+
+
<!-- 璐у竵tanchuang -->
- <CurrencyDialog
+ <CurrencyDialog
:visible.sync="currencyDialogVisible"
@selected="handleCurrencySelected"
/>
<!-- 缁撶畻鏂瑰紡tanchuang -->
- <SettleStyleDialog
+ <SettleStyleDialog
:visible.sync="settleStyleDialogVisible"
@selected="handleSettleStyleSelected"
/>
<!-- 瀹㈡埛鍒嗙被tanchuang -->
- <CustomerTypeDialog
+ <CustomerTypeDialog
:visible.sync="customerTypeDialogVisible"
@selected="handleCustomerTypeSelected"
/>
@@ -442,7 +442,7 @@
return {
openEdit: true,
activeTab: 'basic',
-
+
// 琛ㄥ崟鏁版嵁
formData: {
HNumber: '',
@@ -454,7 +454,7 @@
HMateOutEmp: '',
HCreateOrgID: '',
HUSEORGID: '',
-
+
// 鍏朵粬淇℃伅
HLinkMan: '',
HLinkPhone: '',
@@ -480,7 +480,7 @@
HCusStatus: '',
HCusTypeName: '',
HCusTypeID: '0',
-
+
// 绯荤粺淇℃伅
HCreator: '',
HCreateDate: '',
@@ -491,7 +491,7 @@
HDeleteMan: '',
HDeleteDate: ''
},
-
+
// 楠岃瘉
rules: {
HNumber: [
@@ -507,19 +507,19 @@
{ required: true, message: '璇烽�夋嫨浣跨敤缁勭粐', trigger: 'change' }
]
},
-
+
organizationList: [],
-
-
+
+
areaDialogVisible: false,
currencyDialogVisible: false,
settleStyleDialogVisible: false,
customerTypeDialogVisible: false,
-
+
saveDisabled: false,
auditDisabled: false,
-
- baseURL: process.env.VUE_APP_BASE_URL || 'http://47.96.97.237/API/',
+
+ baseURL: process.env.VUE_APP_BASE_API || 'http://47.96.97.237/API/',
user: 'admin'
}
},
@@ -555,7 +555,7 @@
this.formData.HCreator = this.user
this.formData.HCreateDate = new Date().toLocaleString()
},
-
+
loadOrganizations() {
axios.get(`${this.baseURL}/Web/GetOrganizations`)
.then(response => {
@@ -572,7 +572,7 @@
this.$modal.msgError('鍔犺浇缁勭粐鏁版嵁澶辫触!')
})
},
-
+
handleOperationType() {
switch (this.operationType) {
case 1: // 鏂板
@@ -589,13 +589,13 @@
break
}
},
-
+
handleAddNew() {
this.auditDisabled = true
this.getMaxBillID()
},
-
+
handleSerialAdd() {
this.formData.HCusTypeName = this.HCusClsName
@@ -603,19 +603,19 @@
this.setHNumber(this.HCusTypeID)
this.auditDisabled = true
},
-
-
+
+
handleEdit() {
this.loadEditData(this.linterid)
},
-
-
+
+
handleCopy() {
this.loadEditData(this.linterid)
this.auditDisabled = true
},
-
-
+
+
getMaxBillID() {
axios.get(`${this.baseURL}/Gy_Customer/GetMAXBillID`)
.then(response => {
@@ -625,7 +625,7 @@
console.error('鑾峰彇鏈�澶у崟鎹甀D澶辫触:', error)
})
},
-
+
// 璁剧疆娴佹按鍙�
setHNumber(typeID) {
axios.get(`${this.baseURL}/Gy_Customer/getMaxNum`, {
@@ -644,7 +644,7 @@
this.$modal.msgError('鑾峰彇娴佹按鍙峰け璐�!')
})
},
-
+
loadEditData(interId) {
axios.get(`${this.baseURL}/Gy_Customer/xg_extendCheckEmp`, {
params: { HInterID: interId }
@@ -653,7 +653,7 @@
if (response.data.data && response.data.data.length > 0) {
const data = response.data.data[0]
this.populateFormData(data)
-
+
if (data.瀹℃牳浜� && data.瀹℃牳浜� !== '') {
this.saveDisabled = true
this.auditDisabled = true
@@ -664,8 +664,8 @@
this.$modal.msgError('鍔犺浇瀹㈡埛鏁版嵁澶辫触!')
})
},
-
-
+
+
populateFormData(data) {
this.formData = {
...this.formData,
@@ -703,11 +703,11 @@
HChecker: data.瀹℃牳浜� || '',
HCheckDate: data.瀹℃牳鏃ユ湡 || ''
}
-
+
this.formData.HUpDater = this.user
this.formData.HUpDateDate = new Date().toLocaleString()
},
-
+
// 淇濆瓨
async handleSave() {
const validMain = await new Promise(resolve => {
@@ -735,7 +735,7 @@
if (this.operationType === 3) {
// 缂栬緫淇濆瓨
url = `${this.baseURL}/Gy_Customer/AddBill1`
- params = {
+ params = {
oMain: JSON.stringify(formData) + ';' + this.linterid + ';' + this.user + ';Gy_Customer_Edit'
}
}
@@ -799,19 +799,19 @@
return callback()
},
-
+
// 琛ㄥ崟楠岃瘉
validateForm() {
if (!this.formData.HNumber) {
this.$modal.msgWarning('璇疯緭鍏ュ鎴蜂唬鐮�!')
return false
}
-
+
if (!this.formData.HName) {
this.$modal.msgWarning('璇疯緭鍏ュ鎴峰悕绉�!')
return false
}
-
+
// 澧炲�肩◣鐜囬獙璇�
const taxRate = this.formData.HTaxRate
// if (taxRate && taxRate.substring(taxRate.length - 1) === '.') {
@@ -823,10 +823,10 @@
this.$modal.msgWarning('澧炲�肩◣鐜囪杈撳叆姝ｇ‘鏁板瓧!')
return false
}
-
+
return true
},
-
+
// 瀹℃牳
handleAudit() {
axios.get(`${this.baseURL}/Gy_Customer/AuditGy_Customer`, {
@@ -849,13 +849,13 @@
this.$modal.msgError('瀹℃牳澶辫触!')
})
},
-
+
// 閫�鍑�
handleExit() {
this.openEdit = false
this.$emit('editClose', false)
},
-
+
// 鍏抽棴瀵硅瘽妗�
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -865,7 +865,7 @@
})
.catch(_ => {})
},
-
+
// 淇濆瓨閰嶇疆
saveConfig() {
const config = {
@@ -876,40 +876,40 @@
}
localStorage.setItem('Gy_Customer_Edit', JSON.stringify(config))
},
-
+
// 鎵撳紑瀵硅瘽妗嗘柟娉�
openAreaDialog() {
this.areaDialogVisible = true
},
-
+
openCurrencyDialog() {
this.currencyDialogVisible = true
},
-
+
openSettleStyleDialog() {
this.settleStyleDialogVisible = true
},
-
+
openCustomerTypeDialog() {
this.customerTypeDialogVisible = true
},
-
+
// 瀵硅瘽妗嗛�夋嫨鍥炶皟
handleAreaSelected(data) {
this.formData.HAreaName = data.鍦板尯鍚嶇О
this.formData.HAreaID = data.HItemID
},
-
+
handleCurrencySelected(data) {
this.formData.HCurName = data.璐у竵鍚嶇О
this.formData.HCurID = data.HItemID
},
-
+
handleSettleStyleSelected(data) {
this.formData.HSSName = data.缁撶畻鏂瑰紡鍚嶇О
this.formData.HSSID = data.HItemID
},
-
+
handleCustomerTypeSelected(data) {
this.formData.HCusTypeName = data.瀹㈡埛鍒嗙被鍚嶇О
this.formData.HCusTypeID = data.HItemID
@@ -947,4 +947,4 @@
.el-button-group {
margin-bottom: 10px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/GyCustomer/index.vue b/src/views/GyCustomer/index.vue
index b7da1d3..84b23ef 100644
--- a/src/views/GyCustomer/index.vue
+++ b/src/views/GyCustomer/index.vue
@@ -356,7 +356,7 @@
uploadData: [],
uploadTableLoading: false,
- baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/",
+ baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
user: "admin",
};
},
@@ -376,7 +376,7 @@
this.getTreeData();
this.getList();
this.getDefaultFilterScheme();
-
+
},
getTreeData() {
@@ -945,4 +945,4 @@
.filter-collapse {
margin-top: 10px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/ICMO/ScICMOReportBill/ScICMOReportBillEdit.vue b/src/views/ICMO/ScICMOReportBill/ScICMOReportBillEdit.vue
index 4ad5ebb..fdd1974 100644
--- a/src/views/ICMO/ScICMOReportBill/ScICMOReportBillEdit.vue
+++ b/src/views/ICMO/ScICMOReportBill/ScICMOReportBillEdit.vue
@@ -269,7 +269,7 @@
linterid: 0,
HSouceBillType: '',
- baseURL: process.env.VUE_APP_BASE_URL || 'http://47.96.97.237/API/'
+ baseURL: process.env.VUE_APP_BASE_API || 'http://47.96.97.237/API/'
}
},
@@ -296,7 +296,7 @@
},
methods: {
async initData() {
-
+
const params = this.$route ? this.$route.query : {}
if (this.propOperationType !== null && this.propOperationType !== undefined) {
this.OperationType = this.propOperationType
@@ -335,7 +335,7 @@
this.$set(this.form, 'HGroupName', sessionStorage.HGroup || '')
this.$set(this.form, 'HEmpID', sessionStorage.HEmpID || 0)
this.$set(this.form, 'HEmpName', sessionStorage.HEmpName || '')
- }
+ }
} catch (error) {
@@ -878,7 +878,7 @@
return true
},
-
+
handleRemove(file, fileList) {
console.log(file, fileList)
},
@@ -926,4 +926,4 @@
.el-table {
margin-top: 10px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/basic/gyProperty/gyPropertyList.vue b/src/views/basic/gyProperty/gyPropertyList.vue
index 43aee43..0a01a5e 100644
--- a/src/views/basic/gyProperty/gyPropertyList.vue
+++ b/src/views/basic/gyProperty/gyPropertyList.vue
@@ -1159,10 +1159,10 @@
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
if (this.queryParams.HNumber) {
- this.sWhere += " and 浠撳簱浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
+ this.sWhere += " and 杈呭姪灞炴�т唬鐮� like '%" + this.queryParams.HNumber + "%'";
}
if (this.queryParams.HName) {
- this.sWhere += " and 浠撳簱鍚嶇О like '%" + this.queryParams.HName + "%'";
+ this.sWhere += " and 杈呭姪灞炴�у悕绉� like '%" + this.queryParams.HName + "%'";
}
// if (this.queryParams.HOrgID) {
// this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'";
diff --git a/src/views/component/AreaDialog/index.vue b/src/views/component/AreaDialog/index.vue
index b1d526c..2cc522c 100644
--- a/src/views/component/AreaDialog/index.vue
+++ b/src/views/component/AreaDialog/index.vue
@@ -10,21 +10,21 @@
<el-card class="search-card">
<div slot="header" class="clearfix">
<span>鏌ヨ鏉′欢</span>
- <el-button
- style="float: right; padding: 3px 0"
+ <el-button
+ style="float: right; padding: 3px 0"
type="text"
@click="toggleCollapse"
>
{{ collapse ? '灞曞紑' : '鏀惰捣' }}
</el-button>
</div>
-
+
<el-form :model="queryParams" ref="queryForm" :inline="true">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="鍦板尯浠ｇ爜">
- <el-input
- v-model="queryParams.HNumber"
+ <el-input
+ v-model="queryParams.HNumber"
placeholder="璇疯緭鍏ュ湴鍖轰唬鐮�"
clearable
/>
@@ -32,8 +32,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="鍦板尯鍚嶇О">
- <el-input
- v-model="queryParams.HName"
+ <el-input
+ v-model="queryParams.HName"
placeholder="璇疯緭鍏ュ湴鍖哄悕绉�"
clearable
/>
@@ -82,8 +82,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="鍐呭">
- <el-input
- v-model="queryParams.ColContent"
+ <el-input
+ v-model="queryParams.ColContent"
placeholder="璇疯緭鍏ュ唴瀹�"
clearable
/>
@@ -117,7 +117,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column
+ <el-table-column
v-for="column in tableColumns"
:key="column.field"
:prop="column.field"
@@ -136,7 +136,7 @@
</el-table-column>
</el-table>
-
+
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
@@ -168,7 +168,7 @@
dialogVisible: false,
collapse: false,
loading: false,
-
+
// 鏌ヨ鍙傛暟
queryParams: {
HNumber: '',
@@ -177,24 +177,24 @@
Comparator: '0',
ColContent: ''
},
-
+
// 琛ㄦ牸鏁版嵁
tableData: [],
tableColumns: [],
selectedRow: null,
multipleSelection: [],
-
+
// 鍒嗛〉
pagination: {
page: 1,
size: 50,
total: 0
},
-
+
// 闅愯棌瀛楁
hiddenFields: ["HItemID", "鐭唬鐮�", "鐖剁骇ID", "绛夌骇", "鏈骇鏍囧織", "鍔╄鐮�", "鍒涘缓缁勭粐", "鑻辨枃鍚嶇О"],
-
- baseURL: process.env.VUE_APP_BASE_URL || 'http://47.96.97.237/API/',
+
+ baseURL: process.env.VUE_APP_BASE_API || 'http://47.96.97.237/API/',
user: 'admin',
HModName: 'Gy_AreaSet'
}
@@ -227,12 +227,12 @@
initData() {
this.loadTableData()
},
-
+
async loadTableData() {
this.loading = true
try {
const sWhere = this.buildQueryCondition()
-
+
const response = await axios.get(`${this.baseURL}/Gy_BadReason/Gy_AreaSetList`, {
params: {
sWhere: sWhere,
@@ -241,7 +241,7 @@
size: this.pagination.size
}
})
-
+
if (response.data.count === 1) {
this.tableData = response.data.data
this.pagination.total = response.data.total || response.data.data.length
@@ -256,11 +256,11 @@
this.loading = false
}
},
-
-
+
+
buildQueryCondition() {
let sWhere = ""
-
+
if (this.queryParams.HNumber) {
sWhere += ` and 鍦板尯浠ｇ爜 like '%${this.queryParams.HNumber}%'`
@@ -269,7 +269,7 @@
sWhere += ` and 鍦板尯鍚嶇О like '%${this.queryParams.HName}%'`
}
- if (this.queryParams.ColName && this.queryParams.ColName !== "0" &&
+ if (this.queryParams.ColName && this.queryParams.ColName !== "0" &&
this.queryParams.Comparator && this.queryParams.Comparator !== "0") {
let com = ""
switch (this.queryParams.Comparator) {
@@ -291,26 +291,26 @@
}
sWhere += ` and ${this.queryParams.ColName} ${com}`
}
-
-
+
+
sWhere += this.addSWhereByOpenType()
-
+
return sWhere
},
-
+
addSWhereByOpenType() {
return " and 绂佺敤鏍囧織 = '鍚�' and 瀹℃牳浜� != ''"
},
-
+
generateTableColumns(columnList) {
this.tableColumns = []
-
+
this.tableColumns.push({ type: 'selection', fixed: 'left' })
-
+
if (columnList && columnList.length > 0) {
columnList.forEach(item => {
@@ -322,12 +322,12 @@
sortable: true,
width: 200
}
-
-
+
+
if (item.ColmType === 'DateTime') {
column.formatter = this.formatDate
}
-
+
this.tableColumns.push(column)
}
})
@@ -346,13 +346,13 @@
this.tableColumns = [...this.tableColumns, ...defaultColumns]
}
},
-
+
// 鏌ヨ
handleQuery() {
this.pagination.page = 1
this.loadTableData()
},
-
+
// 閲嶇疆鏌ヨ
handleReset() {
this.queryParams = {
@@ -365,29 +365,29 @@
this.pagination.page = 1
this.loadTableData()
},
-
+
// 鍒锋柊
handleRefresh() {
this.loadTableData()
},
-
+
// 鍒囨崲鎶樺彔鐘舵��
toggleCollapse() {
this.collapse = !this.collapse
},
-
+
// 琛屽弻鍑讳簨浠�
handleRowDblClick(row) {
this.selectedRow = row
this.confirmSelection()
},
-
+
// 琛岀偣鍑讳簨浠�
handleRowClick(row) {
this.$refs.table.toggleRowSelection(row)
this.selectedRow = row
},
-
+
// 閫夋嫨鍙樺寲
handleSelectionChange(selection) {
this.multipleSelection = selection
@@ -395,7 +395,7 @@
this.selectedRow = selection[0]
}
},
-
+
// 纭閫夋嫨
confirmSelection() {
if (this.selectedRow) {
@@ -408,12 +408,12 @@
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
}
},
-
+
// 閫�鍑�
handleExit() {
this.dialogVisible = false
},
-
+
// 鍏抽棴瀵硅瘽妗�
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -422,20 +422,20 @@
})
.catch(_ => {})
},
-
+
// 鍒嗛〉澶у皬鏀瑰彉
handleSizeChange(size) {
this.pagination.size = size
this.pagination.page = 1
this.loadTableData()
},
-
+
// 褰撳墠椤垫敼鍙�
handleCurrentChange(page) {
this.pagination.page = page
this.loadTableData()
},
-
+
// 鏍煎紡鍖栨棩鏈�
formatDate(dateString) {
if (!dateString) return ''
diff --git a/src/views/component/BarCodeDetail/index.vue b/src/views/component/BarCodeDetail/index.vue
index bb5dafc..3de45f5 100644
--- a/src/views/component/BarCodeDetail/index.vue
+++ b/src/views/component/BarCodeDetail/index.vue
@@ -125,7 +125,7 @@
allColumns: [],
selectedColumns: [],
selectedRows: [],
- baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/"
+ baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/"
}
},
methods: {
@@ -138,8 +138,8 @@
const hmainid = record.hmainid || record.HInterID
const billNo = record.鍗曟嵁鍙� || record.HBillNo
-
-
+
+
let billTypeDesc = ''
switch (record.鍗曟嵁绫诲瀷 || '') {
case '1201': billTypeDesc = '澶栬喘鍏ュ簱鍗�'; break
@@ -170,10 +170,10 @@
this.loading = true
try {
const sWhere = `${HInterID},'${HBillType}','${HBillNo}'`
-
+
const url = `${this.baseURL}/Kf_ICStockInOutBill/Kf_BarCodeDetailQuery`
const params = { sWhere }
-
+
const response = await axios.get(url, { params })
const data = response.data
@@ -196,7 +196,7 @@
const columns = []
const allColumns = []
-
+
columns.push({
type: 'selection',
width: 55,
@@ -213,7 +213,7 @@
sortable: true
}
-
+
switch (colName) {
case 'HItemID':
columnConfig.hide = true
@@ -246,7 +246,7 @@
handleCellEdit(row, field, value) {
- const ref = /^\d+(\.\d+)?$/
+ const ref = /^\d+(\.\d+)?$/
switch (field) {
case 'HMaterialJQty':
@@ -327,12 +327,12 @@
validateData() {
- const ref = /^\d+(\.\d+)?$/
+ const ref = /^\d+(\.\d+)?$/
for (let i = 0; i < this.tableData.length; i++) {
const row = this.tableData[i]
-
+
const weight = row.HMaterialJQty + ''
if (!ref.test(weight)) {
this.$message.warning(`绗�${i + 1}琛岋細閲嶉噺缁存姢璇疯緭鍏ヤ笉灏忎簬0鐨勬暟瀛楋紒`)
@@ -365,12 +365,12 @@
applyColumnSettings() {
this.tableColumns = [
- this.tableColumns[0],
+ this.tableColumns[0],
...this.allColumns.filter(col => this.selectedColumns.includes(col.field))
]
this.columnDialogVisible = false
-
-
+
+
this.saveColumnSettings()
},
@@ -380,20 +380,20 @@
saveColumnSettings() {
-
+
},
// 鍚堣琛岃绠�
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 (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
@@ -452,4 +452,4 @@
:deep(.el-card__body) {
padding: 12px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/component/CurrencyDialog/index.vue b/src/views/component/CurrencyDialog/index.vue
index 943ce98..44b393e 100644
--- a/src/views/component/CurrencyDialog/index.vue
+++ b/src/views/component/CurrencyDialog/index.vue
@@ -10,21 +10,21 @@
<el-card class="search-card">
<div slot="header" class="clearfix">
<span>鏌ヨ鏉′欢</span>
- <el-button
- style="float: right; padding: 3px 0"
+ <el-button
+ style="float: right; padding: 3px 0"
type="text"
@click="toggleCollapse"
>
{{ collapse ? '灞曞紑' : '鏀惰捣' }}
</el-button>
</div>
-
+
<el-form :model="queryParams" ref="queryForm" :inline="true">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="璐у竵浠ｇ爜">
- <el-input
- v-model="queryParams.HNumber"
+ <el-input
+ v-model="queryParams.HNumber"
placeholder="璇疯緭鍏ヨ揣甯佷唬鐮�"
clearable
@keyup.enter.native="handleQuery"
@@ -33,8 +33,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="璐у竵鍚嶇О">
- <el-input
- v-model="queryParams.HName"
+ <el-input
+ v-model="queryParams.HName"
placeholder="璇疯緭鍏ヨ揣甯佸悕绉�"
clearable
@keyup.enter.native="handleQuery"
@@ -84,8 +84,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="鍐呭">
- <el-input
- v-model="queryParams.ColContent"
+ <el-input
+ v-model="queryParams.ColContent"
placeholder="璇疯緭鍏ュ唴瀹�"
clearable
@keyup.enter.native="handleQuery"
@@ -124,7 +124,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column
+ <el-table-column
v-for="column in tableColumns"
:key="column.field"
:prop="column.field"
@@ -192,24 +192,24 @@
Comparator: '0',
ColContent: ''
},
-
+
tableData: [],
tableColumns: [],
selectedRow: null,
multipleSelection: [],
-
+
pagination: {
page: 1,
size: 50,
total: 0
},
-
+
currentFilterScheme: '',
HInterID_Choose: 0,
-
+
hiddenFields: ["HItemID"],
-
- baseURL: process.env.VUE_APP_BASE_URL || 'http://47.96.97.237/API/',
+
+ baseURL: process.env.VUE_APP_BASE_API || 'http://47.96.97.237/API/',
user: 'admin',
HModName: 'Gy_Currency',
HModuleName: '璐у竵鍒楄〃缁存姢'
@@ -245,12 +245,12 @@
this.loadTableData()
this.getDefaultFilterScheme()
},
-
+
async loadTableData() {
this.loading = true
try {
const sWhere = this.buildQueryCondition()
-
+
const response = await axios.get(`${this.baseURL}/Gy_Currency/list1`, {
params: {
sWhere: sWhere,
@@ -259,7 +259,7 @@
size: this.pagination.size
}
})
-
+
if (response.data.count === 1) {
this.tableData = response.data.data
this.pagination.total = response.data.total || response.data.data.length
@@ -274,18 +274,18 @@
this.loading = false
}
},
-
+
buildQueryCondition() {
let sWhere = ""
-
+
if (this.queryParams.HNumber) {
sWhere += ` and 璐у竵浠ｇ爜 like '%${this.queryParams.HNumber}%'`
}
if (this.queryParams.HName) {
sWhere += ` and 璐у竵鍚嶇О like '%${this.queryParams.HName}%'`
}
-
- if (this.queryParams.ColName && this.queryParams.ColName !== "0" &&
+
+ if (this.queryParams.ColName && this.queryParams.ColName !== "0" &&
this.queryParams.Comparator && this.queryParams.Comparator !== "0") {
let com = ""
switch (this.queryParams.Comparator) {
@@ -307,24 +307,24 @@
}
sWhere += ` and ${this.queryParams.ColName} ${com}`
}
-
+
sWhere += this.addSWhereByOpenType()
-
+
return sWhere
},
-
+
addSWhereByOpenType() {
return " and 绂佺敤鏍囪 = '' and 瀹℃牳浜� != ''"
},
-
+
// 鐢熸垚琛ㄦ牸鍒�
generateTableColumns(columnList) {
this.tableColumns = []
-
+
// 娣诲姞閫夋嫨鍒�
this.tableColumns.push({ type: 'selection', fixed: 'left' })
-
+
// 鍔ㄦ�佺敓鎴愬垪
if (columnList && columnList.length > 0) {
columnList.forEach(item => {
@@ -336,11 +336,11 @@
sortable: true,
width: 200
}
-
+
if (item.ColmType === 'DateTime') {
column.formatter = this.formatDate
}
-
+
this.tableColumns.push(column)
}
})
@@ -361,13 +361,13 @@
this.tableColumns = [...this.tableColumns, ...defaultColumns]
}
},
-
+
// 鏌ヨ
handleQuery() {
this.pagination.page = 1
this.loadTableData()
},
-
+
// 閲嶇疆鏌ヨ
handleReset() {
this.queryParams = {
@@ -380,35 +380,35 @@
this.pagination.page = 1
this.loadTableData()
},
-
+
// 鍒锋柊
handleRefresh() {
this.loadTableData()
},
-
+
// 鍒囨崲鎶樺彔鐘舵��
toggleCollapse() {
this.collapse = !this.collapse
},
-
+
// 琛屽弻鍑讳簨浠�
handleRowDblClick(row) {
this.selectedRow = row
this.confirmSelection()
},
-
+
// 琛岀偣鍑讳簨浠�
handleRowClick(row) {
this.$refs.table.toggleRowSelection(row)
this.selectedRow = row
},
-
+
handleCurrencyCodeClick(row) {
console.log('鐐瑰嚮璐у竵浠ｇ爜:', row)
this.selectedRow = row
this.confirmSelection()
},
-
+
// 閫夋嫨鍙樺寲
handleSelectionChange(selection) {
this.multipleSelection = selection
@@ -416,7 +416,7 @@
this.selectedRow = selection[0]
}
},
-
+
// 纭閫夋嫨
confirmSelection() {
if (this.selectedRow) {
@@ -430,12 +430,12 @@
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
}
},
-
+
// 閫�鍑�
handleExit() {
this.dialogVisible = false
},
-
+
// 鍏抽棴瀵硅瘽妗�
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -444,20 +444,20 @@
})
.catch(_ => {})
},
-
+
// 鍒嗛〉澶у皬鏀瑰彉
handleSizeChange(size) {
this.pagination.size = size
this.pagination.page = 1
this.loadTableData()
},
-
+
// 褰撳墠椤垫敼鍙�
handleCurrentChange(page) {
this.pagination.page = page
this.loadTableData()
},
-
+
// 鏍煎紡鍖栨棩鏈�
formatDate(dateString) {
if (!dateString) return ''
@@ -468,7 +468,7 @@
return dateString
}
},
-
+
// 鑾峰彇榛樿杩囨护鏂规
async getDefaultFilterScheme() {
try {
@@ -480,12 +480,12 @@
Type: "Default"
}
})
-
+
if (response.data.count === 1) {
const data = response.data.data[0]
this.HInterID_Choose = data.hmainid
this.currentFilterScheme = `褰撳墠杩囨护鏂规锛�${data.鏂规鍚嶇О} (${data.澶囨敞})`
-
+
// 搴旂敤杩囨护鏉′欢
this.applyFilterConditions(response.data.data)
}
@@ -493,7 +493,7 @@
console.error('鑾峰彇杩囨护鏂规澶辫触:', error)
}
},
-
+
// 搴旂敤杩囨护鏉′欢
applyFilterConditions(filterData) {
filterData.forEach(item => {
@@ -502,13 +502,13 @@
}
})
},
-
+
// 淇濆瓨杩囨护鏂规
handleSaveScheme() {
// 瀹炵幇淇濆瓨杩囨护鏂规鐨勯�昏緫
this.$message.info('淇濆瓨鏂规鍔熻兘')
},
-
+
// 璇诲彇杩囨护鏂规
handleReadScheme() {
// 瀹炵幇璇诲彇杩囨护鏂规鐨勯�昏緫
@@ -565,4 +565,4 @@
color: #fc9393;
margin: 10px 0;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/component/CustomerTypeDialog/index.vue b/src/views/component/CustomerTypeDialog/index.vue
index 4e7b048..23bfe60 100644
--- a/src/views/component/CustomerTypeDialog/index.vue
+++ b/src/views/component/CustomerTypeDialog/index.vue
@@ -10,21 +10,21 @@
<el-card class="search-card">
<div slot="header" class="clearfix">
<span>鏌ヨ鏉′欢</span>
- <el-button
- style="float: right; padding: 3px 0"
+ <el-button
+ style="float: right; padding: 3px 0"
type="text"
@click="toggleCollapse"
>
{{ collapse ? '灞曞紑' : '鏀惰捣' }}
</el-button>
</div>
-
+
<el-form :model="queryParams" ref="queryForm" :inline="true">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="瀹㈡埛鍒嗙被浠ｇ爜">
- <el-input
- v-model="queryParams.HNumber"
+ <el-input
+ v-model="queryParams.HNumber"
placeholder="璇疯緭鍏ュ鎴峰垎绫讳唬鐮�"
clearable
@keyup.enter.native="handleQuery"
@@ -33,8 +33,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="瀹㈡埛鍒嗙被鍚嶇О">
- <el-input
- v-model="queryParams.HName"
+ <el-input
+ v-model="queryParams.HName"
placeholder="璇疯緭鍏ュ鎴峰垎绫诲悕绉�"
clearable
@keyup.enter.native="handleQuery"
@@ -84,8 +84,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="鍐呭">
- <el-input
- v-model="queryParams.ColContent"
+ <el-input
+ v-model="queryParams.ColContent"
placeholder="璇疯緭鍏ュ唴瀹�"
clearable
/>
@@ -127,8 +127,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="鍐呭">
- <el-input
- v-model="queryParams.ColContent1"
+ <el-input
+ v-model="queryParams.ColContent1"
placeholder="璇疯緭鍏ュ唴瀹�"
clearable
/>
@@ -169,8 +169,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="鍐呭">
- <el-input
- v-model="queryParams.ColContent2"
+ <el-input
+ v-model="queryParams.ColContent2"
placeholder="璇疯緭鍏ュ唴瀹�"
clearable
/>
@@ -230,7 +230,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column
+ <el-table-column
v-for="column in tableColumns"
:key="column.field"
:prop="column.field"
@@ -292,7 +292,7 @@
collapse: false,
loading: false,
treeLoading: false,
-
+
// 鏌ヨ鍙傛暟
queryParams: {
HNumber: '',
@@ -307,35 +307,35 @@
Comparator2: '0',
ColContent2: ''
},
-
+
// 鏍戝舰鏁版嵁
treeData: [],
treeProps: {
children: 'children',
label: 'title'
},
-
+
// 琛ㄦ牸鏁版嵁
tableData: [],
tableColumns: [],
selectedRow: null,
multipleSelection: [],
-
+
// 鍒嗛〉
pagination: {
page: 1,
size: 50,
total: 0
},
-
+
// 杩囨护鏂规
currentFilterScheme: '',
HInterID_Choose: 0,
-
+
// 闅愯棌瀛楁
hiddenFields: ["HItemID"],
-
- baseURL: process.env.VUE_APP_BASE_URL || 'http://47.96.97.237/API/',
+
+ baseURL: process.env.VUE_APP_BASE_API || 'http://47.96.97.237/API/',
user: 'admin',
HModName: 'Gy_CusType',
HModuleName: '瀹㈡埛鍒嗙被鍒楄〃缁存姢'
@@ -372,13 +372,13 @@
this.loadTableData()
this.getDefaultFilterScheme()
},
-
+
// 鍔犺浇鏍戝舰鏁版嵁
async loadTreeData() {
this.treeLoading = true
try {
const response = await axios.get(`${this.baseURL}/Gy_BadReason/Gy_CusTypeTreeListByLevel`)
-
+
if (response.data.count === 1) {
this.treeData = JSON.parse(response.data.data)
} else {
@@ -391,13 +391,13 @@
this.treeLoading = false
}
},
-
+
// 鍔犺浇琛ㄦ牸鏁版嵁
async loadTableData() {
this.loading = true
try {
const sWhere = this.buildQueryCondition()
-
+
const response = await axios.get(`${this.baseURL}/Gy_BadReason/Gy_CusTypeList`, {
params: {
sWhere: sWhere,
@@ -406,7 +406,7 @@
size: this.pagination.size
}
})
-
+
if (response.data.count === 1) {
this.tableData = response.data.data
this.pagination.total = response.data.total || response.data.data.length
@@ -421,11 +421,11 @@
this.loading = false
}
},
-
+
// 鏋勫缓鏌ヨ鏉′欢
buildQueryCondition() {
let sWhere = ""
-
+
// 鍩烘湰鏌ヨ鏉′欢
if (this.queryParams.HNumber) {
sWhere += ` and 瀹㈡埛鍒嗙被浠ｇ爜 like '%${this.queryParams.HNumber}%'`
@@ -433,16 +433,16 @@
if (this.queryParams.HName) {
sWhere += ` and 瀹㈡埛鍒嗙被鍚嶇О like '%${this.queryParams.HName}%'`
}
-
+
// 澶勭悊涓夌粍杩囨护鏉′欢
const filterGroups = [
{ colName: this.queryParams.ColName, comparator: this.queryParams.Comparator, content: this.queryParams.ColContent },
{ colName: this.queryParams.ColName1, comparator: this.queryParams.Comparator1, content: this.queryParams.ColContent1 },
{ colName: this.queryParams.ColName2, comparator: this.queryParams.Comparator2, content: this.queryParams.ColContent2 }
]
-
+
filterGroups.forEach(filter => {
- if (filter.colName && filter.colName !== "0" &&
+ if (filter.colName && filter.colName !== "0" &&
filter.comparator && filter.comparator !== "0") {
let com = ""
switch (filter.comparator) {
@@ -465,26 +465,26 @@
sWhere += ` and ${filter.colName} ${com}`
}
})
-
+
// 娣诲姞鎵撳紑绫诲瀷鐨勮繃婊ゆ潯浠�
sWhere += this.addSWhereByOpenType()
-
+
return sWhere
},
-
+
// 鏍规嵁鎵撳紑绫诲瀷娣诲姞鏉′欢
addSWhereByOpenType() {
// 杩欓噷鍙互鏍规嵁闇�瑕佹坊鍔犵壒瀹氱殑杩囨护鏉′欢
return " and 绂佺敤鏍囧織 = '鍚�' and 瀹℃牳浜� != ''"
},
-
+
// 鐢熸垚琛ㄦ牸鍒�
generateTableColumns(columnList) {
this.tableColumns = []
-
+
// 娣诲姞閫夋嫨鍒�
this.tableColumns.push({ type: 'selection', fixed: 'left' })
-
+
// 鍔ㄦ�佺敓鎴愬垪
if (columnList && columnList.length > 0) {
columnList.forEach(item => {
@@ -496,12 +496,12 @@
sortable: true,
width: 200
}
-
+
// 鏍规嵁瀛楁绫诲瀷璁剧疆涓嶅悓鐨勬ā鏉�
if (item.ColmType === 'DateTime') {
column.formatter = this.formatDate
}
-
+
this.tableColumns.push(column)
}
})
@@ -519,7 +519,7 @@
this.tableColumns = [...this.tableColumns, ...defaultColumns]
}
},
-
+
handleTreeNodeClick(data) {
let sWhere = ""
if (data.id !== '0') {
@@ -527,7 +527,7 @@
}
this.loadTableDataWithCondition(sWhere)
},
-
+
async loadTableDataWithCondition(sWhere) {
this.loading = true
try {
@@ -537,7 +537,7 @@
user: this.user
}
})
-
+
if (response.data.count === 1) {
this.tableData = response.data.data
this.pagination.total = response.data.total || response.data.data.length
@@ -548,12 +548,12 @@
this.loading = false
}
},
-
+
handleQuery() {
this.pagination.page = 1
this.loadTableData()
},
-
+
handleReset() {
this.queryParams = {
HNumber: '',
@@ -571,44 +571,44 @@
this.pagination.page = 1
this.loadTableData()
},
-
+
// 鍒锋柊
handleRefresh() {
this.loadTreeData()
this.loadTableData()
},
-
+
toggleCollapse() {
this.collapse = !this.collapse
},
-
+
// 琛屽弻鍑讳簨浠�
handleRowDblClick(row) {
this.selectedRow = row
this.confirmSelection()
},
-
+
// 琛岀偣鍑讳簨浠�
handleRowClick(row) {
this.$refs.table.toggleRowSelection(row)
this.selectedRow = row
},
-
+
handleCustomerTypeCodeClick(row) {
console.log('鐐瑰嚮瀹㈡埛鍒嗙被浠ｇ爜:', row)
this.selectedRow = row
this.confirmSelection()
},
-
-
+
+
handleSelectionChange(selection) {
this.multipleSelection = selection
if (selection.length === 1) {
this.selectedRow = selection[0]
}
},
-
+
confirmSelection() {
if (this.selectedRow) {
@@ -621,12 +621,12 @@
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
}
},
-
+
// 閫�鍑�
handleExit() {
this.dialogVisible = false
},
-
+
// 鍏抽棴瀵硅瘽妗�
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -635,20 +635,20 @@
})
.catch(_ => {})
},
-
+
// 鍒嗛〉澶у皬鏀瑰彉
handleSizeChange(size) {
this.pagination.size = size
this.pagination.page = 1
this.loadTableData()
},
-
+
// 褰撳墠椤垫敼鍙�
handleCurrentChange(page) {
this.pagination.page = page
this.loadTableData()
},
-
+
// 鏍煎紡鍖栨棩鏈�
formatDate(dateString) {
if (!dateString) return ''
@@ -659,7 +659,7 @@
return dateString
}
},
-
+
// 鑾峰彇榛樿杩囨护鏂规
async getDefaultFilterScheme() {
try {
@@ -671,12 +671,12 @@
Type: "Default"
}
})
-
+
if (response.data.count === 1) {
const data = response.data.data[0]
this.HInterID_Choose = data.hmainid
this.currentFilterScheme = `褰撳墠杩囨护鏂规锛�${data.鏂规鍚嶇О} (${data.澶囨敞})`
-
+
// 搴旂敤杩囨护鏉′欢
this.applyFilterConditions(response.data.data)
}
@@ -684,7 +684,7 @@
console.error('鑾峰彇杩囨护鏂规澶辫触:', error)
}
},
-
+
// 搴旂敤杩囨护鏉′欢
applyFilterConditions(filterData) {
filterData.forEach(item => {
@@ -693,17 +693,17 @@
}
})
},
-
+
// 淇濆瓨杩囨护鏂规
handleSaveScheme() {
this.$message.info('淇濆瓨鏂规鍔熻兘')
},
-
+
// 璇诲彇杩囨护鏂规
handleReadScheme() {
this.$message.info('璇诲彇鏂规鍔熻兘')
},
-
+
// 鍒楄缃�
handleColumnSetting() {
this.$message.info('鍒楄缃姛鑳�')
@@ -791,4 +791,4 @@
.el-tree >>> .el-tree-node.is-current > .el-tree-node__content {
background-color: #aef0f7;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/component/PackStockDetail/index.vue b/src/views/component/PackStockDetail/index.vue
index 2509806..9fa23cd 100644
--- a/src/views/component/PackStockDetail/index.vue
+++ b/src/views/component/PackStockDetail/index.vue
@@ -110,13 +110,13 @@
loading: false, //椤甸潰鍔犺浇鍔ㄧ敾鏄剧ず鏍囪
dialogVisible: false, //鍖呰瀹瑰櫒鍑哄叆搴撴槑缁嗘暟鎹樉绀烘爣璁�
columnDialogVisible: false, //鍒楄缃寜閽樉绀烘爣璁�
-
+
tableData: [], //琛ㄦ牸鏁版嵁
tableColumns: [], //琛ㄦ牸鍒楁暟鎹�
- allColumns: [],
+ allColumns: [],
selectedColumns: [],
selectedRows: [],
- baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/"
+ baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/"
}
},
methods: {
@@ -129,8 +129,8 @@
const hmainid = record.hmainid || record.HInterID
const billNo = record.鍗曟嵁鍙� || record.HBillNo
-
-
+
+
let billTypeDesc = ''
switch (record.鍗曟嵁绫诲瀷 || '') {
case '1201': billTypeDesc = '澶栬喘鍏ュ簱鍗�'; break
@@ -163,10 +163,10 @@
this.loading = true
try {
const sWhere = " and hmainid = " + `${HInterID}` ;
-
+
const url = `${this.baseURL}/Kf_ICStockInOutBill/Kf_PackStockDetailQuery`
const params = { sWhere }
-
+
const response = await axios.get(url, { params })
const data = response.data
@@ -191,7 +191,7 @@
const columns = []
const allColumns = []
-
+
columns.push({
type: 'selection',
width: 55,
@@ -208,7 +208,7 @@
sortable: true
}
-
+
switch (colName) {
case 'HItemID':
columnConfig.hide = true
@@ -241,12 +241,12 @@
applyColumnSettings() {
this.tableColumns = [
- this.tableColumns[0],
+ this.tableColumns[0],
...this.allColumns.filter(col => this.selectedColumns.includes(col.field))
]
this.columnDialogVisible = false
-
-
+
+
this.saveColumnSettings()
},
@@ -256,7 +256,7 @@
saveColumnSettings() {
-
+
},
//#endregion
@@ -265,13 +265,13 @@
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 (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
diff --git a/src/views/component/SettleStyleDialog/index.vue b/src/views/component/SettleStyleDialog/index.vue
index e15d97a..c265627 100644
--- a/src/views/component/SettleStyleDialog/index.vue
+++ b/src/views/component/SettleStyleDialog/index.vue
@@ -11,21 +11,21 @@
<el-card class="search-card">
<div slot="header" class="clearfix">
<span>鏌ヨ鏉′欢</span>
- <el-button
- style="float: right; padding: 3px 0"
+ <el-button
+ style="float: right; padding: 3px 0"
type="text"
@click="toggleCollapse"
>
{{ collapse ? '灞曞紑' : '鏀惰捣' }}
</el-button>
</div>
-
+
<el-form :model="queryParams" ref="queryForm" :inline="true">
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="浠ｇ爜">
- <el-input
- v-model="queryParams.HNumber"
+ <el-input
+ v-model="queryParams.HNumber"
placeholder="璇疯緭鍏ヤ唬鐮�"
clearable
@keyup.enter.native="handleQuery"
@@ -34,8 +34,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="鍚嶇О">
- <el-input
- v-model="queryParams.HName"
+ <el-input
+ v-model="queryParams.HName"
placeholder="璇疯緭鍏ュ悕绉�"
clearable
@keyup.enter.native="handleQuery"
@@ -44,8 +44,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="缁撶畻鏂瑰紡浠ｇ爜">
- <el-input
- v-model="queryParams.HNumber2"
+ <el-input
+ v-model="queryParams.HNumber2"
placeholder="璇疯緭鍏ョ粨绠楁柟寮忎唬鐮�"
clearable
style="width: 190px"
@@ -97,8 +97,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="鍐呭">
- <el-input
- v-model="queryParams.ColContent"
+ <el-input
+ v-model="queryParams.ColContent"
placeholder="璇疯緭鍏ュ唴瀹�"
clearable
@keyup.enter.native="handleQuery"
@@ -138,7 +138,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column
+ <el-table-column
v-for="column in tableColumns"
:key="column.field"
:prop="column.field"
@@ -189,7 +189,7 @@
dialogVisible: false,
collapse: false,
loading: false,
-
+
// 鏌ヨ鍙傛暟
queryParams: {
HNumber: '',
@@ -199,28 +199,28 @@
Comparator: '0',
ColContent: ''
},
-
+
// 琛ㄦ牸鏁版嵁
tableData: [],
tableColumns: [],
selectedRow: null,
multipleSelection: [],
-
+
// 鍒嗛〉
pagination: {
page: 1,
size: 50,
total: 0
},
-
+
// 杩囨护鏂规
currentFilterScheme: '',
HInterID_Choose: 0,
-
+
// 闅愯棌瀛楁
hiddenFields: ["HItemID", "HUSEORGID", "HCREATEORGID", "鐖剁骇ID"],
-
- baseURL: process.env.VUE_APP_BASE_URL || 'http://47.96.97.237/API/',
+
+ baseURL: process.env.VUE_APP_BASE_API || 'http://47.96.97.237/API/',
user: 'admin',
HModName: 'Gy_SettleStyle',
HModuleName: '缁撶畻鏂瑰紡缁存姢',
@@ -257,13 +257,13 @@
this.loadTableData()
this.getDefaultFilterScheme()
},
-
+
// 鍔犺浇琛ㄦ牸鏁版嵁
async loadTableData() {
this.loading = true
try {
const sWhere = this.buildQueryCondition()
-
+
const response = await axios.get(`${this.baseURL}/Gy_SettleStyle/SettleStyleList`, {
params: {
sWhere: sWhere,
@@ -271,7 +271,7 @@
Organization: this.Organization
}
})
-
+
if (response.data.count === 1) {
this.tableData = response.data.data
console.log('缁撶畻鏂瑰紡鏁版嵁:', this.tableData)
@@ -287,11 +287,11 @@
this.loading = false
}
},
-
+
// 鏋勫缓鏌ヨ鏉′欢
buildQueryCondition() {
let sWhere = ""
-
+
// 鍩烘湰鏌ヨ鏉′欢
if (this.queryParams.HNumber) {
sWhere += ` and 缁撶畻鏂瑰紡浠ｇ爜 like '%${this.queryParams.HNumber}%'`
@@ -299,9 +299,9 @@
if (this.queryParams.HName) {
sWhere += ` and 缁撶畻鏂瑰紡鍚嶇О like '%${this.queryParams.HName}%'`
}
-
+
// 楂樼骇杩囨护鏉′欢
- if (this.queryParams.ColName && this.queryParams.ColName !== "0" &&
+ if (this.queryParams.ColName && this.queryParams.ColName !== "0" &&
this.queryParams.Comparator && this.queryParams.Comparator !== "0") {
let com = ""
switch (this.queryParams.Comparator) {
@@ -323,26 +323,26 @@
}
sWhere += ` and ${this.queryParams.ColName} ${com}`
}
-
+
// 娣诲姞鎵撳紑绫诲瀷鐨勮繃婊ゆ潯浠�
sWhere += this.addSWhereByOpenType()
-
+
return sWhere
},
-
+
// 鏍规嵁鎵撳紑绫诲瀷娣诲姞鏉′欢
addSWhereByOpenType() {
// 杩欓噷鍙互鏍规嵁闇�瑕佹坊鍔犵壒瀹氱殑杩囨护鏉′欢
return " and 绂佺敤鏍囪 = ''"
},
-
+
// 鐢熸垚琛ㄦ牸鍒�
generateTableColumns(columnList) {
this.tableColumns = []
-
+
// 娣诲姞閫夋嫨鍒�
this.tableColumns.push({ type: 'selection', fixed: 'left' })
-
+
// 鍔ㄦ�佺敓鎴愬垪
if (columnList && columnList.length > 0) {
columnList.forEach(item => {
@@ -354,12 +354,12 @@
sortable: true,
width: 200
}
-
+
// 鏍规嵁瀛楁绫诲瀷璁剧疆涓嶅悓鐨勬ā鏉�
if (item.ColmType === 'DateTime') {
column.formatter = this.formatDate
}
-
+
this.tableColumns.push(column)
}
})
@@ -378,13 +378,13 @@
this.tableColumns = [...this.tableColumns, ...defaultColumns]
}
},
-
+
// 鏌ヨ
handleQuery() {
this.pagination.page = 1
this.loadTableData()
},
-
+
// 閲嶇疆鏌ヨ
handleReset() {
this.queryParams = {
@@ -398,14 +398,14 @@
this.pagination.page = 1
this.loadTableData()
},
-
+
// 閲嶆柊鍚屾
async handleResCnz() {
if (!this.queryParams.HNumber2) {
this.$message.warning('璇疯緭鍏ョ粨绠楁柟寮忎唬鐮�')
return
}
-
+
try {
const response = await axios.get(`${this.baseURL}/Gy_SettleStyle/Gy_SettleStyleViewApi`, {
params: {
@@ -413,7 +413,7 @@
Type: 'JSFS'
}
})
-
+
if (response.data.count === 1) {
this.$message.success(response.data.Message)
this.loadTableData() // 閲嶆柊鍔犺浇鏁版嵁
@@ -425,29 +425,29 @@
this.$message.error('閲嶆柊鍚屾澶辫触')
}
},
-
+
// 鍒锋柊
handleRefresh() {
this.loadTableData()
},
-
+
// 鍒囨崲鎶樺彔鐘舵��
toggleCollapse() {
this.collapse = !this.collapse
},
-
+
// 琛屽弻鍑讳簨浠�
handleRowDblClick(row) {
this.selectedRow = row
this.confirmSelection()
},
-
+
// 琛岀偣鍑讳簨浠�
handleRowClick(row) {
this.$refs.table.toggleRowSelection(row)
this.selectedRow = row
},
-
+
// 閫夋嫨鍙樺寲
handleSelectionChange(selection) {
this.multipleSelection = selection
@@ -455,7 +455,7 @@
this.selectedRow = selection[0]
}
},
-
+
// 纭閫夋嫨
confirmSelection() {
if (this.selectedRow) {
@@ -468,12 +468,12 @@
this.$message.warning('璇烽�夋嫨涓�鏉℃暟鎹�')
}
},
-
+
// 閫�鍑�
handleExit() {
this.dialogVisible = false
},
-
+
// 鍏抽棴瀵硅瘽妗�
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -482,20 +482,20 @@
})
.catch(_ => {})
},
-
+
// 鍒嗛〉澶у皬鏀瑰彉
handleSizeChange(size) {
this.pagination.size = size
this.pagination.page = 1
this.loadTableData()
},
-
+
// 褰撳墠椤垫敼鍙�
handleCurrentChange(page) {
this.pagination.page = page
this.loadTableData()
},
-
+
// 鏍煎紡鍖栨棩鏈�
formatDate(dateString) {
if (!dateString) return ''
@@ -506,7 +506,7 @@
return dateString
}
},
-
+
// 鑾峰彇榛樿杩囨护鏂规
async getDefaultFilterScheme() {
try {
@@ -518,12 +518,12 @@
Type: "Default"
}
})
-
+
if (response.data.count === 1) {
const data = response.data.data[0]
this.HInterID_Choose = data.hmainid
this.currentFilterScheme = `褰撳墠杩囨护鏂规锛�${data.鏂规鍚嶇О} (${data.澶囨敞})`
-
+
// 搴旂敤杩囨护鏉′欢
this.applyFilterConditions(response.data.data)
}
@@ -531,7 +531,7 @@
console.error('鑾峰彇杩囨护鏂规澶辫触:', error)
}
},
-
+
// 搴旂敤杩囨护鏉′欢
applyFilterConditions(filterData) {
filterData.forEach(item => {
@@ -540,17 +540,17 @@
}
})
},
-
+
// 淇濆瓨杩囨护鏂规
handleSaveScheme() {
this.$message.info('淇濆瓨鏂规鍔熻兘')
},
-
+
// 璇诲彇杩囨护鏂规
handleReadScheme() {
this.$message.info('璇诲彇鏂规鍔熻兘')
},
-
+
// 鍒楄缃�
handleColumnSetting() {
this.$message.info('鍒楄缃姛鑳�')
@@ -606,4 +606,4 @@
color: #fc9393;
margin: 10px 0;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/component/printList/barcode.vue b/src/views/component/printList/barcode.vue
new file mode 100644
index 0000000..a640440
--- /dev/null
+++ b/src/views/component/printList/barcode.vue
@@ -0,0 +1,143 @@
+<template>
+ <div>
+ <button @click="getTemp">鎵撳嵃</button>
+ <div id="report_holder"> </div>
+ </div>
+</template>
+
+<script>
+import PrintJS from 'print-js'
+import axios from "axios";
+export default {
+ name: "HBarPlanPrintWeb",
+ data() {
+ return {
+ styleList: [],
+ handleMessage: this.$route.query,
+ pageSize: {
+ width: 0,
+ height: 0
+ },
+ reportViewer: null,
+ baseUrl: process.env.VUE_APP_BASE_API,
+ json_data: {
+ recordset: [],
+ },
+ grfPath: "",
+
+ }
+ },
+ async mounted() {
+ // 鑾峰彇 鎵撳嵃鐨勬暟鎹�
+ await this.getPrintData()
+
+ rubylong.grhtml5.barcodeURL = this.baseUrl + "/Utility/Barcode.ashx";
+ this.reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", this.grfPath, this.json_data.recordset,
+ );
+ this.reportViewer.start();
+ },
+ methods: {
+ getUrlVars_JSON() {
+ var datajson;
+ var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+ var arr = str.substring(str.lastIndexOf("=") + 1);
+ datajson = JSON.parse(decodeURI(arr));
+ return datajson;
+ },
+ async getPrintData() {
+ let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp);
+ let sql = "";
+ if (this.$route.query.Type == "Kf_SellOutBillList") {
+ sql =
+ "exec h_p_Kf_SellOutBillList_PrintSellOutBill " +
+ this.handleMessage.linterid.toString();
+ } else if (this.$route.query.Type == "HGy_BarCodeBill") {
+ sql =
+ "select * from h_v_IF_BarCodeBillList where hmainid in(" +
+ this.handleMessage.linterid.toString() +
+ ") order by hmainid desc";
+ } else if (this.$route.query.Type == "HPOInStockBill") {
+ sql =
+ "select * from h_v_Sc_PrintMouldProdOutBillList where hmainid=" +
+ this.handleMessage.linterid.toString() +
+ " order by hmainid";
+ } else if (this.$route.query.Type == "HGyStockPlaceBarCode") {
+ let condition = decodeURI(this.handleMessage.linterid.toString());
+ sql = `SELECT
+ CEILING(CAST(t.row_num AS FLOAT) / 2) AS orderid,
+ MAX(CASE WHEN t.row_num % 2 = 1 THEN t.鏉＄爜缂栧彿 END) AS 鏉＄爜缂栧彿1,
+ MAX(CASE WHEN t.row_num % 2 = 1 THEN t.浠撲綅鍚嶇О END) AS 浠撲綅鍚嶇О1,
+ MAX(CASE WHEN t.row_num % 2 = 0 THEN t.鏉＄爜缂栧彿 END) AS 鏉＄爜缂栧彿2,
+ MAX(CASE WHEN t.row_num % 2 = 0 THEN t.浠撲綅鍚嶇О END) AS 浠撲綅鍚嶇О2
+ FROM (
+ SELECT
+ 鏉＄爜缂栧彿, 浠撲綅鍚嶇О,
+ ROW_NUMBER() OVER (ORDER BY t1.HItemID) AS row_num
+ FROM h_v_IF_StockPlaceList t1 where 鏉＄爜缂栧彿 in (${condition})
+ ) AS t
+ GROUP BY CEILING(CAST(t.row_num AS FLOAT) / 2)
+ ORDER BY orderid;`;
+ }
+ try{
+ let res = await axios.get(this.baseURL + "/CommonModel/searchMethod", {
+ params: {
+ sql: sql,
+ user: sessionStorage["HUserName"],
+ ModRightNameCheck: "",
+ // , "HSubID": data[i].hsubid
+ },
+ })
+ // 灏� 娓叉煋鏁版嵁 鍜� 妯℃澘鍔犺浇鍒版湰鍦�
+ let result = res.data;
+ this.json_data.recordset = result.data;
+ this.grfPath = "./static/grf/" + OpenTmp + ".grf"
+ console.log(this.json_data);
+ }catch(err) {
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!" + err);
+ }
+
+ },
+ getTemp() {
+ // 瀵规瘡涓鎵撳嵃鐨勫璞℃坊鍔犲垎椤�
+ let docs = document.querySelectorAll('[_grrecno]')
+ this.pageSize.width = docs[0].offsetWidth
+ this.pageSize.height = docs[0].offsetHeight
+ docs.forEach((elem, index) => {
+ elem.classList.add('printable')
+ })
+ let styles = document.querySelectorAll('[id^="_gridcss"]')
+ this.styleList.push(...styles)
+
+ this.execPrint()
+ },
+ execPrint() {
+ PrintJS({
+ printable: 'report_holder',
+ scanStyles: false,
+ type: 'html',
+ style: this.styleList[0].innerText + ` @media print {
+ .printable {
+ page-break-inside: avoid;
+ page-break-after: always;
+ }
+
+ @page {
+ size: ${this.pageSize.width + 1}px ${this.pageSize.height + 1}px;
+ margin: 0;
+ padding: 0;
+ }
+
+ * {
+ margin: 0;
+ padding: 0;
+ }
+ `,
+ })
+
+
+ }
+ }
+}
+</script>
+
+<style></style>
\ No newline at end of file
diff --git a/src/views/component/printList/hBarPlanPrint.vue b/src/views/component/printList/hBarPlanPrint.vue
index 3418a8e..3541e8b 100644
--- a/src/views/component/printList/hBarPlanPrint.vue
+++ b/src/views/component/printList/hBarPlanPrint.vue
@@ -1,83 +1,106 @@
<template>
- <div>
- <div id="report_holder"> </div>
- </div>
+ <div>
+ <div id="report_holder"></div>
+ </div>
</template>
<script>
-import { webapp_ws_ajax_run, webapp_urlprotocol_startup, urlAddRandomNo } from "@/utils/grwebapp";
-import axios from 'axios'
+import {
+ webapp_ws_ajax_run,
+ webapp_urlprotocol_startup,
+ urlAddRandomNo,
+} from "@/utils/grwebapp";
+import axios from "axios";
export default {
- name: 'HBarPlanPrint',
- data() {
- return {
- handleMessage: this.$route.query,
- baseURL: process.env.VUE_APP_BASE_API,
- //瀹為檯搴旂敤涓紝data搴旇涓虹▼搴忎腑閫氳繃鍚勭閫斿緞鑾峰彇鍒扮殑鏁版嵁锛屾渶鍚庤灏嗘暟鎹浆鎹负鎶ヨ〃闇�瑕佺殑XML鎴朖SON鏍煎紡鐨勫瓧绗︿覆鏁版嵁
- json_data: {
- recordset: []
- },
-
- }
+ name: "HBarPlanPrint",
+ data() {
+ return {
+ handleMessage: this.$route.query,
+ baseURL: process.env.VUE_APP_BASE_API,
+ //瀹為檯搴旂敤涓紝data搴旇涓虹▼搴忎腑閫氳繃鍚勭閫斿緞鑾峰彇鍒扮殑鏁版嵁锛屾渶鍚庤灏嗘暟鎹浆鎹负鎶ヨ〃闇�瑕佺殑XML鎴朖SON鏍煎紡鐨勫瓧绗︿覆鏁版嵁
+ json_data: {
+ recordset: [],
+ },
+ };
+ },
+ mounted() {
+ this.ws_both_from_object();
+ },
+ // created() {
+ // this.ws_both_from_object()
+ // },
+ methods: {
+ // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
+ getUrlVars_JSON() {
+ var datajson;
+ var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
+ var arr = str.substring(str.lastIndexOf("=") + 1);
+ datajson = JSON.parse(decodeURI(arr));
+ return datajson;
},
- mounted() {
- this.ws_both_from_object()
-
+ ws_both_from_object() {
+ let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp);
+ let sql = "";
+ if (this.$route.query.Type == "Kf_SellOutBillList") {
+ sql =
+ "exec h_p_Kf_SellOutBillList_PrintSellOutBill " +
+ this.handleMessage.linterid.toString();
+ } else if (this.$route.query.Type == "HGy_BarCodeBill") {
+ sql =
+ "select * from h_v_IF_BarCodeBillList where hmainid in(" +
+ this.handleMessage.linterid.toString() +
+ ") order by hmainid desc";
+ } else if (this.$route.query.Type == "HPOInStockBill") {
+ sql =
+ "select * from h_v_Sc_PrintMouldProdOutBillList where hmainid=" +
+ this.handleMessage.linterid.toString() +
+ " order by hmainid";
+ } else if (this.$route.query.Type == "HGyStockPlaceBarCode") {
+ let condition = decodeURI(this.handleMessage.linterid.toString());
+ sql = `SELECT
+ CEILING(CAST(t.row_num AS FLOAT) / 2) AS orderid,
+ MAX(CASE WHEN t.row_num % 2 = 1 THEN t.鏉＄爜缂栧彿 END) AS 鏉＄爜缂栧彿1,
+ MAX(CASE WHEN t.row_num % 2 = 1 THEN t.浠撲綅鍚嶇О END) AS 浠撲綅鍚嶇О1,
+ MAX(CASE WHEN t.row_num % 2 = 0 THEN t.鏉＄爜缂栧彿 END) AS 鏉＄爜缂栧彿2,
+ MAX(CASE WHEN t.row_num % 2 = 0 THEN t.浠撲綅鍚嶇О END) AS 浠撲綅鍚嶇О2
+ FROM (
+ SELECT
+ 鏉＄爜缂栧彿, 浠撲綅鍚嶇О,
+ ROW_NUMBER() OVER (ORDER BY t1.HItemID) AS row_num
+ FROM h_v_IF_StockPlaceList t1 where 鏉＄爜缂栧彿 in (${condition})
+ ) AS t
+ GROUP BY CEILING(CAST(t.row_num AS FLOAT) / 2)
+ ORDER BY orderid;`;
+ }
+ axios
+ .get(this.baseURL + "/CommonModel/searchMethod", {
+ params: {
+ sql: sql,
+ user: sessionStorage["HUserName"],
+ ModRightNameCheck: "",
+ // , "HSubID": data[i].hsubid
+ },
+ })
+ .then((response) => {
+ let result = response.data;
+ this.json_data.recordset = result.data;
+ //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
+ var args = {
+ type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
+ // report: this.json_report, //report: JSON.stringify(json_report),
+ report: urlAddRandomNo("./static/grf/" + OpenTmp + ".grf"),
+ data: this.json_data, //data: JSON.stringify(json_data)
+ };
+ console.log(args, this.json_data);
+ webapp_ws_ajax_run(args);
+ // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
+ // reportViewer.start();
+ })
+ .catch((error) => {
+ console.log(22222, error);
+ this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
+ });
},
- // created() {
- // this.ws_both_from_object()
- // },
- methods: {
- // 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
- getUrlVars_JSON() {
- var datajson;
- var str = this.propsData; //鑾峰彇閾炬帴涓紶閫掔殑鍙傛暟
- var arr = str.substring(str.lastIndexOf("=") + 1);
- datajson = JSON.parse(decodeURI(arr));
- return datajson;
- },
- ws_both_from_object() {
- let OpenTmp = decodeURIComponent(this.$route.query.OpenTmp)
- let sql = ''
- if (this.$route.query.Type == 'Kf_SellOutBillList') {
- sql = "exec h_p_Kf_SellOutBillList_PrintSellOutBill " + this.handleMessage.linterid.toString()
- } else if (this.$route.query.Type == 'HGy_BarCodeBill') {
- sql = "select * from h_v_IF_BarCodeBillList where hmainid in(" + this.handleMessage.linterid.toString() + ") order by hmainid desc"
- }else if (this.$route.query.Type == 'HPOInStockBill') {
- sql = "select * from h_v_Sc_PrintMouldProdOutBillList where hmainid=" + this.handleMessage.linterid.toString()+ " order by hmainid"
- }else if(this.$route.query.Type == 'HGyStockPlaceBarCode') {
- let condition = decodeURI(this.handleMessage.linterid.toString())
- console.log(condition)
- sql = "select * from h_v_IF_StockPlaceList where 鏉＄爜缂栧彿 in (" + condition + ") order by HItemID"
- }
- axios.get(this.baseURL + '/CommonModel/searchMethod', {
- params: {
- "sql": sql,
- "user": sessionStorage["HUserName"],
- "ModRightNameCheck": ''
- // , "HSubID": data[i].hsubid
- },
- }).then(response => {
- let result = response.data
- this.json_data.recordset = result.data
- //鍙傛暟鍏蜂綋璇存槑璇峰弬鑰冨府鍔╂枃妗ｄ腑鐨勨�淲EB鎶ヨ〃(B/S鎶ヨ〃)->WEB鎶ヨ〃瀹㈡埛绔�->鍚姩鍙傛暟璇存槑鈥濋儴鍒�
- var args = {
- type: "preview", //璁剧疆涓嶅悓鐨勫睘鎬у彲浠ユ墽琛屼笉鍚岀殑浠诲姟锛屽锛歱review print pdf xls csv txt rtf img grd
- // report: this.json_report, //report: JSON.stringify(json_report),
- report: urlAddRandomNo('./static/grf/' + OpenTmp + '.grf'),
- data: this.json_data //data: JSON.stringify(json_data)
- };
- console.log(args, this.json_data)
- webapp_ws_ajax_run(args);
- // var reportViewer = rubylong.grhtml5.insertReportViewer("report_holder", "./static/grf/閿�鍞嚭搴撳崟.grf", this.json_data);
- // reportViewer.start();
- }).catch(error => {
- console.log(22222, error)
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
-
- }
- },
-}
-
-</script>
\ No newline at end of file
+ },
+};
+</script>
diff --git a/src/views/component/printList/index.vue b/src/views/component/printList/index.vue
index 635d36d..85f427f 100644
--- a/src/views/component/printList/index.vue
+++ b/src/views/component/printList/index.vue
@@ -3,6 +3,7 @@
<el-form ref="formData" :model="formData" label-width="100px">
<div style="padding: 10px; ">
<el-button type="primary" size="small" @click="printClick">鎶ヨ〃鎵撳嵃</el-button>
+ <el-button type="primary" size="small" @click="printClickWeb">鎶ヨ〃鎵撳嵃(缃戦〉)</el-button>
</div>
<el-table v-loading="loading" :data="printdata" ref="printTable" max-height="540"
@selection-change="handleSelectionChange" :row-class-name="rowSysIndex" border>
@@ -66,6 +67,10 @@
handlePrint() {
this.openPrint = true
},
+ printClickWeb() {
+ const routeUrl = this.$router.resolve({ path: '/hBarPlanPrintWeb',query:{linterid:this.linterid.toString(),Type:this.Type.toString(),OpenTmp: encodeURIComponent(this.rowForm.妯℃澘鍚嶇О)} });
+ window.open(routeUrl.href, '_blank');
+ },
printClick() {
const routeUrl = this.$router.resolve({ path: '/hBarPlanPrint',query:{linterid:this.linterid.toString(),Type:this.Type.toString(),OpenTmp: encodeURIComponent(this.rowForm.妯℃澘鍚嶇О)} });
window.open(routeUrl.href, '_blank');
diff --git a/src/views/gyEmployee/edit/index.vue b/src/views/gyEmployee/edit/index.vue
index 6cb0bb3..57ad8ea 100644
--- a/src/views/gyEmployee/edit/index.vue
+++ b/src/views/gyEmployee/edit/index.vue
@@ -902,7 +902,7 @@
CheckBillDisabled: true,
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
- baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/",
+ baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
diff --git a/src/views/gyEmployee/index.vue b/src/views/gyEmployee/index.vue
index ac7292e..d8ddc64 100644
--- a/src/views/gyEmployee/index.vue
+++ b/src/views/gyEmployee/index.vue
@@ -572,7 +572,7 @@
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
- baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/",
+ baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
diff --git a/src/views/gyMaterial/GyMaterialCorrection.vue b/src/views/gyMaterial/GyMaterialCorrection.vue
index 2b20ba1..54b777f 100644
--- a/src/views/gyMaterial/GyMaterialCorrection.vue
+++ b/src/views/gyMaterial/GyMaterialCorrection.vue
@@ -15,15 +15,15 @@
<el-card class="search-card">
<div slot="header" class="clearfix">
<span>鏌ヨ鏉′欢</span>
- <el-button
- style="float: right; padding: 3px 0"
+ <el-button
+ style="float: right; padding: 3px 0"
type="text"
@click="toggleSearchMore"
>
{{ searchMore ? '鏀惰捣' : '鏇村' }}
</el-button>
</div>
-
+
<el-form :model="queryParams" ref="queryForm" label-width="80px">
<el-row :gutter="20">
<el-col :span="6">
@@ -126,7 +126,7 @@
</el-col>
</el-row>
</div>
-
+
<el-button
type="primary"
icon="el-icon-plus"
@@ -175,7 +175,7 @@
</el-button>
</div>
</div>
-
+
<div class="table-container">
<el-table
ref="mainTable"
@@ -204,7 +204,7 @@
</template>
</el-table-column>
</el-table>
-
+
<!-- 鍒嗛〉 -->
<div class="pagination-container">
<el-pagination
@@ -245,7 +245,7 @@
</el-button>
</div>
</div>
-
+
<div class="table-container">
<el-table
ref="tempTable"
@@ -270,7 +270,7 @@
size="mini"
@change="handleCellEdit(row, column.field, $index)"
/>
-
+
<!-- 涓嬫媺閫夋嫨妗� - 鐗╂枡灞炴�� -->
<el-select
v-else-if="column.field === '鐗╂枡灞炴��'"
@@ -283,7 +283,7 @@
<el-option value="鑷埗" label="鑷埗"></el-option>
<el-option value="濮斿" label="濮斿"></el-option>
</el-select>
-
+
<!-- 涓嬫媺閫夋嫨妗� - 浜嬩笟閮� -->
<el-select
v-else-if="column.field === '浜嬩笟閮�'"
@@ -296,7 +296,7 @@
<el-option value="杞浜嬩笟閮�" label="杞浜嬩笟閮�"></el-option>
<el-option value="鍏朵粬浜嬩笟閮�" label="鍏朵粬浜嬩笟閮�"></el-option>
</el-select>
-
+
<!-- 涓嶅彲缂栬緫瀛楁 -->
<span v-else>{{ row[column.field] }}</span>
</template>
@@ -347,34 +347,34 @@
loading: false,
tempLoading: false,
columnSettingVisible: false,
-
+
// 鏌ヨ鍙傛暟
queryParams: {
HNumber: '',
HName: '',
HOrgID: ''
},
-
+
// 杩囨护鏉′欢
filterConditions: [
{ colName: '0', comparator: '0', colContent: '' }
],
-
+
// 缁勭粐閫夐」
organizationOptions: [],
-
+
// 琛ㄦ牸鏁版嵁
tableData: [],
tempTableData: [],
selectedRows: [],
-
+
// 鍒嗛〉
pagination: {
page: 1,
size: 50,
total: 0
},
-
+
// 鍒楅厤缃�
allColumns: [],
mainTableColumns: [],
@@ -384,8 +384,8 @@
openColumnSetting: false,
// 妯″潡鍚嶇О
HModName: 'Gy_Material_Correction',
-
- baseURL: process.env.VUE_APP_BASE_URL || 'http://47.96.97.237/API/',
+
+ baseURL: process.env.VUE_APP_BASE_API || 'http://47.96.97.237/API/',
user: 'admin'
}
},
@@ -414,7 +414,7 @@
await this.getOrganizations()
await this.getTableData()
},
-
+
// 鑾峰彇缁勭粐鍒楄〃
async getOrganizations() {
try {
@@ -429,9 +429,9 @@
this.$modal.msgError('鑾峰彇缁勭粐鍒楄〃澶辫触!')
}
},
-
-
-
+
+
+
// 璁剧疆榛樿鍒�
setDefaultColumns() {
this.allColumns = [
@@ -459,20 +459,20 @@
{ field: '鍒涘缓浜�', title: '鍒涘缓浜�', width: 100 },
{ field: '鍒涘缓鏃堕棿', title: '鍒涘缓鏃堕棿', width: 150 }
]
-
+
this.mainTableColumns = this.allColumns.filter(col => !col.hide)
this.tempTableColumns = this.mainTableColumns.map(col => ({
...col,
editable: this.isEditableColumn(col.field)
}))
},
-
+
// 鑾峰彇琛ㄦ牸鏁版嵁
async getTableData() {
this.loading = true
try {
const sWhere = this.buildWhereCondition()
-
+
const response = await axios.get(`${this.baseURL}/Gy_Material/page`, {
params: {
sWhere: sWhere,
@@ -482,7 +482,7 @@
Organization: ''
}
})
-
+
if (response.data.code === 1) {
this.tableData = response.data.data
this.pagination.total = response.data.count
@@ -495,11 +495,11 @@
this.loading = false
}
},
-
+
// 鏋勫缓鏌ヨ鏉′欢
buildWhereCondition() {
let sWhere = ''
-
+
// 鍩烘湰鏌ヨ鏉′欢
if (this.queryParams.HNumber) {
sWhere += ` and 鐗╂枡浠ｇ爜 like '%${this.queryParams.HNumber}%'`
@@ -510,7 +510,7 @@
if (this.queryParams.HOrgID) {
sWhere += ` and HUSEORGID = '${this.queryParams.HOrgID}'`
}
-
+
// 杩囨护鏉′欢
this.filterConditions.forEach(filter => {
if (filter.colName && filter.colName !== '0' && filter.comparator && filter.comparator !== '0') {
@@ -534,16 +534,16 @@
sWhere += ` and ${filter.colName} ${condition}`
}
})
-
+
return sWhere
},
-
+
// 鏌ヨ
handleSearch() {
this.pagination.page = 1
this.getTableData()
},
-
+
handleColumnSetting() {
this.columnSettingShow = true;
this.openColumnSetting = true;
@@ -568,7 +568,7 @@
this.pagination.page = 1
this.getTableData()
},
-
+
// 娣诲姞杩囨护鏉′欢
addFilter() {
this.filterConditions.push({
@@ -577,50 +577,50 @@
colContent: ''
})
},
-
+
// 鍒犻櫎杩囨护鏉′欢
removeFilter(index) {
this.filterConditions.splice(index, 1)
},
-
+
// 鍒囨崲鏇村鎼滅储鏉′欢
toggleSearchMore() {
this.searchMore = !this.searchMore
},
-
+
// 閫夋嫨琛屽彉鍖�
handleSelectionChange(selection) {
this.selectedRows = selection
},
-
+
// 鏁版嵁纭 - 灏嗛�変腑鐨勬暟鎹鍒跺埌涓存椂琛ㄦ牸
handleDataConfirm() {
if (this.selectedRows.length === 0) {
this.$modal.msgWarning('璇峰厛閫夋嫨瑕佹壒鏀圭殑鏁版嵁!')
return
}
-
+
// 娣辨嫹璐濋�変腑鐨勬暟鎹埌涓存椂琛ㄦ牸
this.tempTableData = JSON.parse(JSON.stringify(this.selectedRows))
-
+
// 閿佸畾涓昏〃鏍间腑宸查�変腑鐨勮锛堥�氳繃CSS绫诲悕锛�
this.$nextTick(() => {
this.$refs.mainTable.clearSelection()
})
-
+
this.$modal.msgSuccess(`宸茬‘璁� ${this.selectedRows.length} 鏉℃暟鎹紝璇峰湪鍙充晶琛ㄦ牸涓繘琛屾壒鏀筦)
},
-
+
// 淇濆瓨鎵规敼鏁版嵁
async handleSave() {
if (this.tempTableData.length === 0) {
this.$modal.msgWarning('娌℃湁闇�瑕佷繚瀛樼殑鏁版嵁!')
return
}
-
+
try {
this.tempLoading = true
-
+
// 杞崲鏁版嵁鏍煎紡
const saveData = this.tempTableData.map(item => ({
HOnceRightRate: item['涓�娆″悎鏍肩巼鏍囧噯鍊�'],
@@ -643,7 +643,7 @@
// 鍏朵粬闇�瑕佷繚瀛樼殑瀛楁...
HItemID: item.HItemID
}))
-
+
// 鏁版嵁楠岃瘉
for (const item of saveData) {
if (!item.HNumber) {
@@ -654,12 +654,12 @@
}
// 鍏朵粬楠岃瘉瑙勫垯...
}
-
+
const dataStr = JSON.stringify(saveData)
const response = await axios.post(`${this.baseURL}/Gy_Material/SaveGy_MaterialList_Batch`, {
msg: dataStr + ';' + this.user + ';' + this.queryParams.HOrgID
})
-
+
if (response.data.count === 1) {
this.$modal.msgSuccess('淇濆瓨鎴愬姛!')
this.tempTableData = []
@@ -673,14 +673,14 @@
this.tempLoading = false
}
},
-
+
// 鍒犻櫎鏁版嵁
async handleDelete() {
if (this.selectedRows.length === 0) {
this.$modal.msgWarning('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁!')
return
}
-
+
try {
await this.$confirm('纭瑕佸垹闄ら�変腑鐨勬暟鎹悧锛�', '鎻愮ず', {
type: 'warning'
@@ -693,7 +693,7 @@
}
})
}
-
+
this.$modal.msgSuccess('鍒犻櫎鎴愬姛!')
this.getTableData()
this.selectedRows = []
@@ -703,13 +703,13 @@
}
}
},
-
+
// 鍗曞厓鏍肩紪杈�
handleCellEdit(row, field, index) {
// 鍙互鍦ㄨ繖閲屾坊鍔犵紪杈戦獙璇侀�昏緫
console.log(`缂栬緫绗�${index + 1}琛岋紝瀛楁: ${field}, 鍊�: ${row[field]}`)
},
-
+
// 涓嬫媺閫夋嫨鍙樺寲
handleSelectChange(field) {
// 鎵归噺鏇存柊鐩稿悓瀛楁鐨勫��
@@ -717,12 +717,12 @@
// 杩欓噷鍙互鏍规嵁涓氬姟闇�姹傚喅瀹氭槸鍚﹀悓姝ユ洿鏂版墍鏈夎鐨勭浉鍚屽瓧娈�
})
},
-
+
// 鍒楄缃�
handleColumnSetting() {
this.columnSettingVisible = true
},
-
+
// 淇濆瓨鍒楄缃�
handleColumnSave(columns) {
this.allColumns = columns
@@ -735,7 +735,7 @@
},
-
+
// 閫�鍑�
handleExit() {
if (this.tempTableData.length > 0) {
@@ -748,26 +748,26 @@
this.handleClose()
}
},
-
+
// 鍏抽棴瀵硅瘽妗�
handleClose() {
this.openCorrect = false
this.$emit('close')
},
-
+
// 鍒嗛〉澶у皬鍙樺寲
handleSizeChange(size) {
this.pagination.size = size
this.pagination.page = 1
this.getTableData()
},
-
+
// 褰撳墠椤靛彉鍖�
handleCurrentChange(page) {
this.pagination.page = page
this.getTableData()
},
-
+
// 宸ュ叿鏂规硶
isEditableColumn(field) {
const nonEditableFields = [
@@ -775,25 +775,25 @@
]
return !nonEditableFields.includes(field)
},
-
+
isSelectColumn(field) {
return ['鐗╂枡灞炴��', '浜嬩笟閮�'].includes(field)
},
-
+
isDateColumn(field) {
return field.includes('鏃堕棿') || field.includes('鏃ユ湡')
},
-
+
formatDate(dateString) {
if (!dateString) return ''
const date = new Date(dateString)
return date.toLocaleString('zh-CN')
},
-
+
getRowClassName({ row }) {
return this.selectedRows.some(selected => selected.HItemID === row.HItemID) ? 'locked-row' : ''
},
-
+
divisionJudgment(divisionStr) {
switch (divisionStr) {
case '娉ㄥ浜嬩笟閮�': return 3
@@ -801,7 +801,7 @@
default: return 0
}
},
-
+
materClsJudgment(materClsStr) {
switch (materClsStr) {
case '澶栬喘': return '1'
@@ -910,4 +910,4 @@
::v-deep .temp-table .el-select {
width: 100%;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/gyStockPlace/edit/index.vue b/src/views/gyStockPlace/edit/index.vue
index 4a806cf..5e98170 100644
--- a/src/views/gyStockPlace/edit/index.vue
+++ b/src/views/gyStockPlace/edit/index.vue
@@ -139,7 +139,7 @@
CheckBillDisabled: true,
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
- baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/",
+ baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
diff --git a/src/views/gyWarehouse/edit/index.vue b/src/views/gyWarehouse/edit/index.vue
index a49f3c7..cc6803e 100644
--- a/src/views/gyWarehouse/edit/index.vue
+++ b/src/views/gyWarehouse/edit/index.vue
@@ -243,7 +243,7 @@
CheckBillDisabled: true,
// OperationType: this.$route.query.OperationType,//淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
- baseURL: process.env.VUE_APP_BASE_URL || "http://47.96.97.237/API/",
+ baseURL: process.env.VUE_APP_BASE_API || "http://47.96.97.237/API/",
user: "admin",
currentRow: [],
lastSelectedRowIndex: null, // 鐢ㄤ簬璁板綍涓婃鐐瑰嚮鐨勮绱㈠紩
diff --git a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
index 166f8e7..bead72d 100644
--- a/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
+++ b/src/views/warehouse/barcodeMaster/Gy_BarCodeBill.vue
@@ -51,7 +51,7 @@
<el-col :span="6">
<el-form-item label="閫夊崟鍙�" prop="HSourceBillNo">
<el-input v-model="form.HSourceBillNo" placeholder="璇疯緭鍏ラ�夊崟鍙�" disabled>
- <el-button class="input-search-btn" slot="append" icon="el-icon-search" @click="openDataDialog(openNum)"></el-button>
+ <el-button class="input-search-btn" slot="append" icon="el-icon-search" @click="openDataDialog(null)"></el-button>
</el-input>
</el-form-item>
</el-col>
@@ -188,7 +188,11 @@
</el-table-column>
<el-table-column align="center" label="杈呭姪灞炴�т唬鐮�" prop="HAuxPropNumber" width="120"
show-overflow-tooltip>
- <template slot-scope="scope"><el-input v-model="scope.row.HAuxPropNumber" /></template>
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.HAuxPropNumber"
+ @keyup.native.f7="openDataDialog(1, scope.row)"
+ @dblclick.native="openDataDialog(1, scope.row)" />
+ </template>
</el-table-column>
<el-table-column align="center" label="杈呭姪灞炴�у悕绉�" prop="HAuxPropName" width="120"
show-overflow-tooltip>
@@ -256,6 +260,13 @@
<el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body @close="closeBill">
<HSourceReportHtml @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName"
:HOrgID='this.form.HOrgID' :HSouceBillType="HSouceBillType" v-if="ScICMOBillShow" />
+
+ <GyProperty
+ @deptEmitDb="dbEmitData"
+ @deptEmit="emitData"
+ :openPage="HModName"
+ v-if="propertyShow"
+ />
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="deptClickSub">纭� 瀹�</el-button>
<el-button @click="deptClose">鍙� 娑�</el-button>
@@ -273,10 +284,11 @@
import HSourceReportHtml from '@/views/component/HSourceReportHtml'
import PrintList from "@/views/component/printList";
import moment from 'moment';
+import GyProperty from "@/views/basic/gyProperty/gyPropertyList.vue";
export default {
name: 'Gy_BarCodeBill',
- components: { HSourceReportHtml, PrintList },
+ components: { HSourceReportHtml, PrintList, GyProperty },
props: {
OperationType: { type: Number, },
linterid: { type: Number, },
@@ -451,6 +463,7 @@
materialShow: false,//鐗╂枡鏁版嵁缁勪欢
gyEmployeeShow: false,//閿�鍞憳鏁版嵁缁勪欢
ScICMOBillShow: false,
+ propertyShow: false,
deptform: {},//寮圭獥閫変腑鏁版嵁
openData: false,//鏁版嵁寮圭獥
dialogTitle: '',
@@ -770,6 +783,17 @@
},
//寮圭獥璧嬪��
dbEmitData(deptRow, num) {
+ if(num) {
+ if(num == 'gyProperty') {
+ this.editWlxxData[this.zbIndex].HAuxPropID = deptRow.HItemID;
+ this.editWlxxData[this.zbIndex]["HAuxPropName"] = deptRow["杈呭姪灞炴�у悕绉�"];
+ this.editWlxxData[this.zbIndex]["HAuxPropNumber"] = deptRow["杈呭姪灞炴�т唬鐮�"];
+ this.propertyShow = false;
+ this.openData = false;
+ }
+
+ return
+ }
console.log(deptRow)
if (deptRow.length > 0) {
this.zbDataShow = false
@@ -1041,8 +1065,9 @@
, 'HPOOrderInterID': result.data[i].閲囪喘璁㈠崟鍐呯爜
, 'HPOOrderEntryID': result.data[i].閲囪喘璁㈠崟瀛愬唴鐮�
, 'HPOOrderBillNo': result.data[i].閲囪喘璁㈠崟鍙�
- , 'HPropertyID': result.data[i].HPropertyID
- , 'HPropertyName': result.data[i].杈呭姪灞炴��
+ , 'HAuxPropID': result.data[i].HPropertyID
+ , 'HAuxPropName': result.data[i].杈呭姪灞炴��
+ , 'HAuxPropNumber': result.data[i].杈呭姪灞炴�т唬鐮�
, 'HSecUnitID': result.data[i].HSecUnitID
, 'HSecUnitName': result.data[i].杈呭姪璁￠噺鍗曚綅
, 'HSecUnitRate': result.data[i].鎹㈢畻鐜�
@@ -1195,11 +1220,21 @@
if (row) {
this.zbIndex = row.index - 1
}
- this.showReset()
- this.HSouceBillType = this.getSupType()
- this.dialogTitle = this.getSupType() + '鍒楄〃'
- this.ScICMOBillShow = true
- this.openData = true
+ if(num) {
+ switch(num) {
+ case 1:
+ this.dialogTitle = '杈呭姪灞炴�у垪琛�'
+ this.propertyShow = true
+ this.openData = true
+ ;break;
+ }
+ }else {
+ this.showReset()
+ this.HSouceBillType = this.getSupType()
+ this.dialogTitle = this.getSupType() + '鍒楄〃'
+ this.ScICMOBillShow = true
+ this.openData = true
+ }
},
}
diff --git a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
index 2c96b12..2bcc0ab 100644
--- a/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
+++ b/src/views/warehouse/transfer/Kf_MoveStockRequestBillEdit.vue
@@ -138,7 +138,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="璋冨叆缁勭粐" prop="HSTOCKINORGID" >
- <el-select v-model="form.HSTOCKINORGID" placeholder="璇烽�夋嫨璋冨叆缁勭粐" :disabled="OperationType == 3">
+ <el-select v-model="form.HSTOCKINORGID" placeholder="璇烽�夋嫨璋冨叆缁勭粐" :disabled="OperationType == 3" @change="StockInOrgChangeHandler">
<el-option
v-for="(item, index) in organizationList"
:key="index"
@@ -632,6 +632,11 @@
this.getdata();
},
methods: {
+ StockInOrgChangeHandler() {
+ this.editData.forEach(element => {
+ element.HSTOCKORGINID = this.form.HSTOCKINORGID
+ });
+ },
fetchData() {
axios
.get(this.baseURL + "/Web/GetOrganizations", {})
@@ -1034,6 +1039,7 @@
杈呭崟浣�: "",
HRemark: "",
HSTOCKORGID: sessionStorage["OrganizationID"],
+ HSTOCKORGINID: this.form.HSTOCKINORGID,
HPropertyID: 0,
杈呭姪灞炴��: "",
};
--
Gitblit v1.9.1