From b5bfca1185e60b954a403ecedd784f50f40fcc80 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 03 十二月 2025 10:33:02 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/views/component/HSourceReportHtml/index.vue | 210 +++++++++++++++++++++--------------------
src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue | 87 +++++++++++------
2 files changed, 165 insertions(+), 132 deletions(-)
diff --git a/src/views/component/HSourceReportHtml/index.vue b/src/views/component/HSourceReportHtml/index.vue
index ea92640..7f7ec1d 100644
--- a/src/views/component/HSourceReportHtml/index.vue
+++ b/src/views/component/HSourceReportHtml/index.vue
@@ -285,7 +285,7 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
- if (this.queryParams.HBillStatus &&this.HSouceBillType == '鐢熶骇璁㈠崟') {
+ if (this.queryParams.HBillStatus && this.HSouceBillType == '鐢熶骇璁㈠崟') {
this.sWhere += " and 鐘舵�� = '" + this.queryParams.HBillStatus + "'";
}
if (this.HSouceBillType == '鐢熶骇璁㈠崟') {
@@ -306,111 +306,117 @@
limit: this.pageSize,
},
}).then((response) => {
+ console.log(response)
this.tyResList = response.data.data; //鎬绘暟鎹�
let data1 = response.data;
+
let option = [];
- if (data1.code == 1) {
- this.btResList = data1.list; //鎺ュ彛琛ㄥご鏁版嵁
- this.total = data1.count;
- var data = []; //鍒楀瓧娈垫暟鎹�
- var col = [];
- var totalArray = ["浠舵暟"];
- //缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) {
- //寰簭閬嶅巻鏁扮粍
- data.push({
- id: data1.list[key].ColmCols,
- name: data1.list[key].ColmCols,
- Type: data1.list[key].ColmType,
- }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
- var patrn = new RegExp(/^h/i);
- if (patrn.test(data1.list[key].ColmCols)) {
- this.titleData[key] = data1.list[key].ColmCols;
- }
+ // if (data1.code == 1) {
+ this.btResList = data1.list; //鎺ュ彛琛ㄥご鏁版嵁
+ this.total = data1.count;
+ var data = []; //鍒楀瓧娈垫暟鎹�
+ var col = [];
+ var totalArray = ["浠舵暟"];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ //寰簭閬嶅巻鏁扮粍
+ data.push({
+ id: data1.list[key].ColmCols,
+ name: data1.list[key].ColmCols,
+ Type: data1.list[key].ColmType,
+ }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ this.titleData[key] = data1.list[key].ColmCols;
}
- //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: "checkbox", fixed: "left", totalRowText: "鍚堣" });
- for (var i = 0; i < data.length; i++) {
- //閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
- if (this.titleData.indexOf(data[i].name) > -1) {
- //妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
- col.push({
- field: data[i].id,
- title: data[i].name,
- align: "center",
- hide: true,
- }); //闅愯棌id鍒�
- } else if (
- totalArray.indexOf(data[i].name) > -1 ||
- data[i].Type == "Decimal" ||
- data[i].Type == "Int32"
- ) {
- //璁＄畻鍒�
- col.push({
- field: data[i].id,
- title: data[i].name,
- align: "center",
- sort: true,
- totalRow: true,
- width: 120,
- });
- } else {
- col.push({
- field: data[i].id,
- title: data[i].name,
- align: "center",
- sort: true,
- width: 200,
- });
- }
- }
- option.cols = [col];
- this.dataList = option;
- option.data = data1.data;
- var result = data1.data;
- option.data = result;
- switch (this.HSouceBillType) {
- case '鐢熶骇璁㈠崟':
- this.HModName = "Sc_ICMOBill_3710";
- break;
- case '鐢熶骇姹囨姤鍗�':
- this.HModName = "Sc_ICMOReportBill_3711";
- break;
- case '閲囪喘璁㈠崟':
- this.HModName = "Cg_POOrderBill_1102";
- break;
- case '鏀舵枡閫氱煡鍗�':
- this.HModName = "Cg_POInStockBill_1103";
- break;
- case '濮斿璁㈠崟':
- this.HModName = "WW_EntrustOrderBill_1601";
- break;
- case '鐢熶骇鍏ュ簱鍗�':
- $("#HProcExchBillNoHidden").show();
- this.HModName = "ProductInBill_1202";
- break;
- case '閲囪喘鍏ュ簱鍗�':
- this.HModName = "POStockInBill_1201";
- break;
- case '閿�鍞��璐�':
- this.HModName = "SellOutBackBill_1247";
- break;
- case '鐢熶骇閫�鏂�':
- this.HModName = "MateOutBackBill_1244";
- break;
- case '宸ュ簭娴佽浆鍗�':
- this.HModName = "ProcessExchangeBill_3772";
- break;
- case '閿�鍞嚭搴撳崟':
- this.HModName = "SellOutBill_1205";
- break;
- case '棰嗘枡鍑哄簱鍗�':
- this.HModName = "MateOutBill_1204";
- break;
- }
- this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
}
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: "checkbox", fixed: "left", totalRowText: "鍚堣" });
+ for (var i = 0; i < data.length; i++) {
+ //閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
+ if (this.titleData.indexOf(data[i].name) > -1) {
+ //妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 //璁＄畻鍒�
+ col.push({
+ field: data[i].id,
+ title: data[i].name,
+ align: "center",
+ hide: true,
+ }); //闅愯棌id鍒�
+ } else if (
+ totalArray.indexOf(data[i].name) > -1 ||
+ data[i].Type == "Decimal" ||
+ data[i].Type == "Int32"
+ ) {
+ //璁＄畻鍒�
+ col.push({
+ field: data[i].id,
+ title: data[i].name,
+ align: "center",
+ sort: true,
+ totalRow: true,
+ width: 120,
+ });
+ } else {
+ col.push({
+ field: data[i].id,
+ title: data[i].name,
+ align: "center",
+ sort: true,
+ width: 200,
+ });
+ }
+ }
+ option.cols = [col];
+ this.dataList = option;
+ if (data1.code == 0) {
+ data1.data = []
+ }
+ option.data = data1.data;
+ var result = data1.data;
+ option.data = result;
+ switch (this.HSouceBillType) {
+ case '鐢熶骇璁㈠崟':
+ this.HModName = "Sc_ICMOBill_3710";
+ break;
+ case '鐢熶骇姹囨姤鍗�':
+ this.HModName = "Sc_ICMOReportBill_3711";
+ break;
+ case '閲囪喘璁㈠崟':
+ this.HModName = "Cg_POOrderBill_1102";
+ break;
+ case '鏀舵枡閫氱煡鍗�':
+ this.HModName = "Cg_POInStockBill_1103";
+ break;
+ case '濮斿璁㈠崟':
+ this.HModName = "WW_EntrustOrderBill_1601";
+ break;
+ case '鐢熶骇鍏ュ簱鍗�':
+ $("#HProcExchBillNoHidden").show();
+ this.HModName = "ProductInBill_1202";
+ break;
+ case '閲囪喘鍏ュ簱鍗�':
+ this.HModName = "POStockInBill_1201";
+ break;
+ case '閿�鍞��璐�':
+ this.HModName = "SellOutBackBill_1247";
+ break;
+ case '鐢熶骇閫�鏂�':
+ this.HModName = "MateOutBackBill_1244";
+ break;
+ case '宸ュ簭娴佽浆鍗�':
+ this.HModName = "ProcessExchangeBill_3772";
+ break;
+ case '閿�鍞嚭搴撳崟':
+ this.HModName = "SellOutBill_1205";
+ break;
+ case '棰嗘枡鍑哄簱鍗�':
+ this.HModName = "MateOutBill_1204";
+ break;
+ }
+ this.DisPlay_HideColumn(this.HModName, sessionStorage["HUserName"], option, this.dataList);
+ // }
}).catch((error) => {
+ console.log(error)
this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
});
},
@@ -674,7 +680,7 @@
if (this.queryParams.HBillNo) {
this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
- if (this.queryParams.HProcExchBillNo &&this.HSouceBillType == '鐢熶骇鍏ュ簱鍗�') {
+ if (this.queryParams.HProcExchBillNo && this.HSouceBillType == '鐢熶骇鍏ュ簱鍗�') {
this.sWhere += " and 娴佽浆鍗″彿 like '%" + this.queryParams.HProcExchBillNo + "%'";
}
if (this.queryParams.HDeptName) {
@@ -686,7 +692,7 @@
if (this.queryParams.PartName) {
this.sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.PartName + "%'";
}
- if (this.queryParams.HBillStatus &&this.HSouceBillType == '鐢熶骇璁㈠崟') {
+ if (this.queryParams.HBillStatus && this.HSouceBillType == '鐢熶骇璁㈠崟') {
this.sWhere += " and 鐘舵�� like '%" + this.queryParams.HBillStatus + "%'";
}
if (sessionStorage["Organization"] == "涔濊彵鐢垫満" && this.HSouceBillType == '鐢熶骇璁㈠崟') {
diff --git a/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue b/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue
index ac73367..c8f6701 100644
--- a/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue
+++ b/src/views/purchase/postockInBack/Kf_POStockInBackBillList.vue
@@ -148,7 +148,7 @@
</el-collapse>
</el-form>
<el-row :gutter="10" class="mb8" style="margin-top: 10px">
- <!-- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddEdit((OperationType = 1))"
id="btn-Add">鏂板</el-button>
</el-col> -->
@@ -202,45 +202,56 @@
</el-col>
</el-row>
<div class="tableBox" v-loading="loading">
- <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
- @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick"
- :row-style="rowStyle" @cell-dblclick="handleDblclick" v-if="tableShow">
- <template v-for="(item, index) in btList">
- <el-table-column type="selection" width="55" align="center" :fixed="item.fixed"
- v-if="item.type == 'checkbox'" :key="index" />
- <el-table-column :align="item.align" :prop="item.field" :label="item.title" :width="item.width"
- :key="item.id" v-else-if="!item.hide && item.type != 'checkbox'" :sortable="item.sort"
- show-overflow-tooltip :fixed="item.fixed">
- <template slot-scope="{ row, column }">
- <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
- <div :style="item.style">
- <span v-if="column.property.includes('鏃ユ湡')">{{
- parseTime(row[column.property], "{y}-{m}-{d}")
- }}</span>
- <el-button type="text" @click="handleEdit(row, (OperationType = 3))"
- v-else-if="column.property == '鍗曟嵁鍙�'">{{ row.鍗曟嵁鍙� }}</el-button>
- <span v-else>{{ row[column.label] }}</span>
- </div>
+ <el-row>
+ <el-col :span="4">
+ <div class="cgtlType" v-for="(item, index) in backTypeList" :key="index" :class="{ 'cgtlActive': typeIndex==index }" @click="backTypeClick(item,index)">
+ {{item.name}}
+ </div>
+ </el-col>
+ <el-col :span="20">
+ <el-table :data="tableData" ref="tableData" max-height="710" :summary-method="getSummaries"
+ @selection-change="handleSelectionChange" show-summary border @row-click="handleRowClick"
+ :row-style="rowStyle" @cell-dblclick="handleDblclick" v-if="tableShow">
+ <template v-for="(item, index) in btList">
+ <el-table-column type="selection" width="55" align="center" :fixed="item.fixed"
+ v-if="item.type == 'checkbox'" :key="index" />
+ <el-table-column :align="item.align" :prop="item.field" :label="item.title"
+ :width="item.width" :key="item.id" v-else-if="!item.hide && item.type != 'checkbox'"
+ :sortable="item.sort" show-overflow-tooltip :fixed="item.fixed">
+ <template slot-scope="{ row, column }">
+ <el-checkbox v-model="checked" v-if="item.type == 'checkbox'"></el-checkbox>
+ <div :style="item.style">
+ <span v-if="column.property.includes('鏃ユ湡')">{{
+ parseTime(row[column.property], "{y}-{m}-{d}")
+ }}</span>
+ <el-button type="text" @click="handleEdit(row, (OperationType = 3))"
+ v-else-if="column.property == '鍗曟嵁鍙�'">{{ row.鍗曟嵁鍙� }}</el-button>
+ <span v-else>{{ row[column.label] }}</span>
+ </div>
+ </template>
+ </el-table-column>
</template>
- </el-table-column>
- </template>
- </el-table>
- <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize"
- :pageSizes="pageSizes" @pagination="getList" />
+ </el-table>
+ <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize"
+ :pageSizes="pageSizes" @pagination="getList" />
+ </el-col>
+
+ </el-row>
+
<el-dialog title="闅愯棌鍒楄缃�" :visible.sync="openRowHide" width="816px" append-to-body>
<RowSettings :colName="btResList" :HModName="HModName" @rowEditClose="rowSetClose" v-if="rowHideShow" />
</el-dialog>
<!-- 缂栬緫 -->
<el-dialog title="缂栬緫" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
@close="close">
- <edit :OperationType="OperationType" :linterid="this.rowForm.hmainid"
- HSouceBillType="0" :copyType="copyType" @editClose="editClose"
- v-if="editShow" />
+ <edit :OperationType="OperationType" :linterid="this.rowForm.hmainid" HSouceBillType="0"
+ :copyType="copyType" @editClose="editClose" v-if="editShow" />
</el-dialog>
<PrintList :linterid="this.rowForm.hmainid" :MyMsg="this.rowForm.hmainid" Type="HPOInStockBill"
HModName="HPOInStockBill" @rowEditClose="rowSetClose" v-if="printListShow" />
<BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
</div>
+
</div>
</template>
@@ -257,8 +268,10 @@
components: { RowSettings, Edit, PrintList, BarCodeDetail },
data() {
return {
+ typeIndex:0,
activeSeach: "",
HModName: "Kf_StockOutRequestBillList",
+ backTypeList: [{ name: ' 閲囪喘閫�鏂欏垪琛�(宸插叆搴�)', value: 1, }, { name: '閲囪喘閫�鏂欏垪琛�(鏈叆搴�)', value: 0, }],
organizationList: JSON.parse(sessionStorage.getItem('organizationList')),
editShow: false,
openEdit: false,
@@ -366,6 +379,9 @@
},
methods: {
+ backTypeClick(item,index){
+ this.typeIndex=index
+ },
getSummaries(param) {
const { columns, data } = param;
const sums = [];
@@ -956,8 +972,8 @@
if (this.ids.length != 1) {
this.$modal.msgError("璇烽�夋嫨涓�琛屾暟鎹�");
} else {
- this.printListShow = true;
- this.openPrintList = true;
+ this.printListShow = true;
+ this.openPrintList = true;
// axios.get(this.baseURL + "/Kf_SellOutBill/CheckSellOutBill_IsExist", {
// params: { HInterID: this.rowForm.hmainid },
// })
@@ -995,4 +1011,15 @@
.xsckdBox .el-date-editor.el-input {
width: 100%;
}
+
+.cgtlType {
+ text-decoration: underline;
+ line-height: 36px;
+ color: #606266;
+ cursor: pointer;
+}
+
+.cgtlActive {
+ color: blue;
+}
</style>
--
Gitblit v1.9.1