From 478e4ac9df56ddc6885c3f7c9abce189ecff7924 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 12 十一月 2025 15:08:52 +0800
Subject: [PATCH] 单据优化
---
src/views/sell/XsSeOutStockBackBillList.vue | 91 +++--
src/views/basic/gyStockPlace/gyStockPlace.vue | 2
src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue | 55 --
src/views/sell/XsSeOutStockBill.vue | 114 ++++--
src/store/modules/permission.js | 6
src/views/sell/sellOutBill/index.vue | 1
src/views/basic/gyEmployee/gyEmployeeEdit.vue | 5
src/router/index.js | 19
src/views/basic/gyWarehouse/gyWarehouse.vue | 10
src/views/component/gyDuty/index.vue | 124 +++++--
src/views/component/gyDorm/index.vue | 6
src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue | 177 +++--------
src/views/ICMO/ScICMOBillList.vue | 212 ++++++++++++-
src/views/basic/gyEmployee/gyEmployee.vue | 2
src/views/sell/xsSeOrderBill/xsSeOrderBill.vue | 57 ++
15 files changed, 533 insertions(+), 348 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 9b5f94c..47a9976 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -243,7 +243,7 @@
},
children: [
{
- path: "/sales/seOrder/xsSeOrderBill",
+ path: "/sales/seOrder/xsSeOrderBill",
component: () => import("@/views/sell/xsSeOrderBill/xsSeOrderBill"),
name: "XsSeOrderBill",
meta: { title: "閿�鍞鍗曠淮鎶�", activeMenu: "sales/seOrder" },
@@ -255,7 +255,7 @@
{
path: "/purchase/poOrder/cgPoOrderBill",
component: Layout,
- hidden: true,
+ hidden: true,
redirect: "noredirect",
meta: {
breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
@@ -329,23 +329,28 @@
},
// 鐢熶骇璁㈠崟
{
- path: "/ICMO/scIcmoBill/scIcmoBillList",
+ path: "/icmo/scIcmoBill/scIcmoBillList",
component: Layout,
hidden: true,
redirect: "noredirect",
meta: {
breadcrumb: false, // 濡傛灉璁剧疆涓篺alse锛屽垯涓嶄細鍦╞readcrumb闈㈠寘灞戜腑鏄剧ず
- activeMenu: "/ICMO/scIcmoBill/scIcmoBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
+ activeMenu: "/icmo/scIcmoBill/scIcmoBillList", // 褰撹矾鐢辫缃簡璇ュ睘鎬э紝鍒欎細楂樹寒鐩稿搴旂殑渚ц竟鏍忋��
},
children: [
{
- path: "/ICMO/scIcmoBill/scIcmoBillList",
+ path: "/icmo/scIcmoBill/scIcmoBillList",
component: () => import("@/views/ICMO/ScICMOBillList.vue"),
- name: "XsSeOutStockBackBillList",
- meta: { title: "鐢熶骇璁㈠崟鍒楄〃", activeMenu: "/ICMO/scIcmoBill" },
+ name: "ScICMOBillList",
+ meta: { title: "鐢熶骇璁㈠崟鍒楄〃", activeMenu: "/icmo/scIcmoBill" },
},
],
},
+ {
+ path: "/ScICMOBillList",
+ component: () => import("@/views/ICMO/ScICMOBillList.vue"),
+ hidden: true,
+ },
];
// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 7539a8c..58da41b 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -142,7 +142,7 @@
},
],
},
- {
+ {
meta: {
icon: "build",
link: null,
@@ -339,7 +339,7 @@
}
],
},
- {
+ {
alwaysShow: true,
component: "Layout",
meta: {
@@ -350,7 +350,7 @@
},
hidden: false,
name: "ICMO",
- path: "/ICMO",
+ path: "/icmo",
redirect: "noRedirect",
children: [
{
diff --git a/src/views/ICMO/ScICMOBillList.vue b/src/views/ICMO/ScICMOBillList.vue
index 74874b4..071308e 100644
--- a/src/views/ICMO/ScICMOBillList.vue
+++ b/src/views/ICMO/ScICMOBillList.vue
@@ -56,10 +56,129 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鍗曟嵁鍙�" prop="HMaterNumber">
+ <el-input
+ v-model="queryParams.HMaterNumber"
+ placeholder="璇疯緭鍏ョ墿鏂欑紪鐮�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="涓氬姟鐘舵��" prop="HStatus">
+ <el-select v-model="queryParams.HStatus" placeholder="璇烽�夋嫨涓氬姟鐘舵��">
+ <el-option
+ :label="item.label"
+ :value="item.value"
+ :key="item.label"
+ v-for="item in [
+ {
+ label: '寮�宸�',
+ value: '寮�宸�',
+ },
+ {
+ label: '璁″垝',
+ value: '璁″垝',
+ },
+ {
+ label: '璁″垝纭',
+ value: '璁″垝纭',
+ },
+ {
+ label: '涓嬭揪',
+ value: '涓嬭揪',
+ },
+ {
+ label: '鍏ㄩ儴',
+ value: '0',
+ },
+ {
+ label: '瀹屽伐',
+ value: '瀹屽伐',
+ },
+ {
+ label: '缁撴',
+ value: '缁撴',
+ },
+ ]"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鏄惁涓嬫帹鐢熸垚娴佽浆鍗�" prop="HSF" label-width="180px">
+ <el-select v-model="queryParams.HSF">
+ <el-option
+ :label="item.label"
+ :value="item.value"
+ :key="item.label"
+ v-for="item in [
+ {
+ label: '鍏ㄩ儴',
+ value: '鍏ㄩ儴',
+ },
+ {
+ label: '宸蹭笅鎺�',
+ value: '宸蹭笅鎺�',
+ },
+ {
+ label: '鏈笅鎺�',
+ value: '鏈笅鎺�',
+ },
+ ]"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="瑙勬牸鍨嬪彿" prop="HModel">
+ <el-input
+ v-model="queryParams.HModel"
+ placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="椤圭洰鍙�" prop="HProject">
+ <el-select v-model="queryParams.HProject">
+ <el-option
+ :label="item.label"
+ :value="item.value"
+ :key="item.label"
+ v-for="item in HProjectList"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐢熶骇杞﹂棿" prop="HDeptName">
+ <el-select v-model="queryParams.HDeptName">
+ <el-option
+ :label="item.label"
+ :value="item.value"
+ :key="item.label"
+ v-for="item in HDeptNameList"
+ ></el-option>
+ </el-select>
+ </el-form-item>
</el-row>
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
+ <el-form-item label="鍗曟嵁绫诲瀷" prop="HBillType">
+ <el-input
+ v-model="queryParams.HBillType"
+ placeholder="璇疯緭鍏ュ崟鎹被鍨�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍞竴ID" prop="HErpID">
+ <el-input
+ v-model="queryParams.HErpID"
+ placeholder="璇疯緭鍏ュ敮涓�ID"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo2">
+ <el-input
+ v-model="HBillNo2"
+ placeholder="璇疯緭鍏ュ崟鎹彿"
+ @keyup.enter.native="syncBill"
+ >
+ <el-button slot="append" @click="syncBill">閲嶆柊鍚屾</el-button>
+ </el-input>
+ </el-form-item>
<el-card class="box-card">
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
@@ -363,7 +482,16 @@
>鍙嶄綔搴�</el-button
>
</el-col>
-
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="push_PackingInStockBill((form = rowForm))"
+ >涓嬫帹鍖呰棰嗙敤鐢宠鍗�</el-button
+ >
+ </el-col>
<el-col :span="1.5">
<el-button
type="primary"
@@ -605,6 +733,7 @@
btnHideShow: false,
rowHideShow: false,
openRowHide: false,
+ HBillNo2: "",
copyType: 0,
comparatorList: [
{ label: "=", value: "=" },
@@ -643,6 +772,8 @@
materialShow: false, //鐗╂枡鏁版嵁缁勪欢
deptform: {}, //寮圭獥閫変腑鏁版嵁
openData: false, //鏁版嵁寮圭獥
+ HProjectList: [], // 椤圭洰鍙峰垪琛�
+ HDeptNameList: [], // 杞﹂棿鍒楄〃
dialogTitle: "",
zuzhiId: "",
organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //缁勭粐鍒楄〃
@@ -678,7 +809,10 @@
ColContent1: "",
ColContent2: "",
ColContent: "",
- timeSpan: 29,
+ HStatus: "寮�宸�",
+ HSF: "鍏ㄩ儴",
+ HProject: "",
+ HInitTimeCycle: 29,
HBeginDate: dayjs(new Date()).subtract(29, "d").format("YYYY-MM-DDTHH:mm:ss"),
HEndDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
},
@@ -738,10 +872,39 @@
},
mounted() {},
created() {
+ this.form.Organization = sessionStorage["Organization"];
this.riqiChange();
+ this.get_HProjectList();
+ this.get_HDeptNameList();
this.getList();
},
methods: {
+ syncBill() {
+ axios.get(`${this.baseURL}/Sc_ICMOBill/Sc_ICMOBillViewApi`, {
+ params: {
+ BillNo: this.HBillNo2,
+ BillType: "3710",
+ },
+ });
+ },
+ async get_HDeptNameList() {
+ let res = await axios.get(`${this.baseURL}/Sc_ICMOBill/GetHDeptList`, {
+ params: { HOrgID: sessionStorage["OrganizationID"] },
+ });
+ console.log(res);
+ this.HDeptNameList = res.data.data.map((e) => {
+ return { label: e.HName, value: e.HItemID };
+ });
+ },
+ async get_HProjectList() {
+ let res = await axios.get(`${this.baseURL}/Gy_Material/Get_HProject`);
+ this.HProjectList = res.data.data.map((e) => {
+ return { label: e.HName, value: e.HItemID };
+ });
+ },
+ push_PackingInStockBill(row) {
+ console.log(row);
+ },
onDateScanOptionChangerHandler(e) {
this.queryParams.timeSpan = e;
if (e == -1) {
@@ -902,21 +1065,21 @@
if (this.pageSize == 0) {
this.pageSize = 50;
}
- this.queryParams.HOrgID = sessionStorage["OrganizationID"]
+ this.queryParams.HOrgID = sessionStorage["OrganizationID"];
- // this.queryParams.HOrgID = 100038
- // this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
- // 鏀舵枡閫氱煡鍗曞垪琛�
-
if (this.dateRange.length > 0) {
this.sWhere +=
" and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
this.sWhere +=
" and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
}
- console.log()
- let Organization = this.organizationList.find(e => e.ID = this.queryParams.HOrgID)?.Name
- try{
+ let Organization = this.organizationList.find(
+ (e) => (e.ID = this.queryParams.HOrgID)
+ )?.Name;
+
+ console.log(Organization);
+
+ try {
let res = await axios.get(this.baseURL + "/Xs_SeOutStockBill/list_byPage", {
params: {
sWhere: this.sWhere,
@@ -1265,20 +1428,29 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
- if (this.queryParams.HNumber) {
- this.sWhere += " and 鐢熶骇璧勬簮浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
- }
- if (this.queryParams.HName) {
- this.sWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + this.queryParams.HName + "%'";
+ if (this.queryParams.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
- if (this.queryParams.HBeginDate && this.queryParams.HEndDate) {
- console.log(this.queryParams.HBeginDate, this.queryParams.HEndDate);
- this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${this.queryParams.HBeginDate}' and CONVERT(varchar(100),鏃ユ湡, 23) <= '${this.queryParams.HEndDate}'`;
+ if (this.queryParams.HMaterName) {
+ this.sWhere += " and 浜у搧浠ｇ爜 like '%" + this.queryParams.HMaterName + "%'";
}
- if (this.queryParams.HOrgID) {
- this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+ if (this.queryParams.HDeptName && this.queryParams.HDeptName != 0) {
+ this.sWhere += " and HDeptID = " + HDeptName;
}
+ if (this.queryParams.HStatus && this.queryParams.HStatus != 0) {
+ this.sWhere += " and 鐘舵�� like '%" + this.queryParams.HStatus + "%'";
+ }
+ if (this.queryParams.HBillType) {
+ this.sWhere += " and 鍗曟嵁绫诲瀷 like '%" + this.queryParams.HBillType + "%'";
+ }
+ if (this.queryParams.HErpID) {
+ sWhere += " and 鍞竴ID like '%" + this.queryParams.HErpID + "%'";
+ }
+ if (this.queryParams.HModel) {
+ this.sWhere += " and 瑙勬牸鍨嬪彿 like '%" + this.queryParams.HModel + "%'";
+ }
+
this.sWhere += this.addSWhereByOpenType();
// this.sWhere += this.getOrgIDByUser();
this.searchOpen = false;
diff --git a/src/views/basic/gyEmployee/gyEmployee.vue b/src/views/basic/gyEmployee/gyEmployee.vue
index f54ae10..6001849 100644
--- a/src/views/basic/gyEmployee/gyEmployee.vue
+++ b/src/views/basic/gyEmployee/gyEmployee.vue
@@ -8,7 +8,7 @@
class="searchBox"
>
<el-row>
- <el-form-item label="鑱屽憳浠ｇ爜" prop="HNumber">
+ <el-form-item label="鑱屽憳浠ｇ爜" prop="HNumber" style="padding-left: 100px">
<el-input
v-model="queryParams.HNumber"
placeholder="璇疯緭鍏ヨ亴鍛樹唬鐮�"
diff --git a/src/views/basic/gyEmployee/gyEmployeeEdit.vue b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
index 5b88abe..5908024 100644
--- a/src/views/basic/gyEmployee/gyEmployeeEdit.vue
+++ b/src/views/basic/gyEmployee/gyEmployeeEdit.vue
@@ -89,7 +89,7 @@
<el-button
slot="append"
icon="el-icon-search"
- @click="openDataDialog(f5)"
+ @click="openDataDialog(5)"
></el-button>
</el-input>
</el-form-item>
@@ -257,7 +257,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="瀹胯垗" prop="HDormName">
- <el-input type="text" v-model="form.HDormName">
+ <el-input type="text" disabled v-model="form.HDormName">
<el-button
slot="append"
icon="el-icon-search"
@@ -1628,6 +1628,7 @@
this.classTimePrjShow = false;
this.dutyShow = false;
this.groupShow = false;
+ this.dormShow = false
},
// 鎵撳紑鏁版嵁鍒楄〃寮圭獥
openDataDialog(num, row) {
diff --git a/src/views/basic/gyStockPlace/gyStockPlace.vue b/src/views/basic/gyStockPlace/gyStockPlace.vue
index dce87f3..e91221e 100644
--- a/src/views/basic/gyStockPlace/gyStockPlace.vue
+++ b/src/views/basic/gyStockPlace/gyStockPlace.vue
@@ -8,7 +8,7 @@
class="searchBox"
>
<el-row>
- <el-form-item label="浠撲綅浠ｇ爜" prop="HNumber">
+ <el-form-item label="浠撲綅浠ｇ爜" prop="HNumber" style="padding-left: 100px">
<el-input
v-model="queryParams.HNumber"
placeholder="璇疯緭鍏ヤ粨浣嶄唬鐮�"
diff --git a/src/views/basic/gyWarehouse/gyWarehouse.vue b/src/views/basic/gyWarehouse/gyWarehouse.vue
index 3402ae3..76c7bd8 100644
--- a/src/views/basic/gyWarehouse/gyWarehouse.vue
+++ b/src/views/basic/gyWarehouse/gyWarehouse.vue
@@ -1,8 +1,14 @@
<template>
<div style="padding: 10px">
- <el-form :model="queryParams" ref="queryForm" label-width="98px" :inline="true" class="searchBox">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ label-width="98px"
+ :inline="true"
+ class="searchBox"
+ >
<el-row>
- <el-form-item label="浠撳簱浠ｇ爜" prop="HNumber">
+ <el-form-item label="浠撳簱浠ｇ爜" prop="HNumber" style="padding-left: 100px">
<el-input
v-model="queryParams.HNumber"
placeholder="璇疯緭鍏ヤ粨搴撲唬鐮�"
diff --git a/src/views/component/gyDorm/index.vue b/src/views/component/gyDorm/index.vue
index fbbcf91..d316c2c 100644
--- a/src/views/component/gyDorm/index.vue
+++ b/src/views/component/gyDorm/index.vue
@@ -24,7 +24,7 @@
sortable
>
<template slot-scope="{ row, column }">
- <span>{{ row[column.label] }}</span>
+ <span>{{ row[column.property] }}</span>
</template>
</el-table-column>
</el-table>
@@ -90,9 +90,7 @@
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
- 瀹㈡埛: [{ required: true, message: "瀹㈡埛涓嶈兘涓虹┖", trigger: "blur" }],
- 鏃ユ湡: [{ required: true, message: "鏃ユ湡涓嶈兘涓虹┖", trigger: "blur" }],
- hl: [{ required: true, message: "姹囩巼涓嶈兘涓虹┖", trigger: "blur" }],
+
},
tableColumns: [
diff --git a/src/views/component/gyDuty/index.vue b/src/views/component/gyDuty/index.vue
index 299ae42..effbc39 100644
--- a/src/views/component/gyDuty/index.vue
+++ b/src/views/component/gyDuty/index.vue
@@ -1,41 +1,62 @@
<template>
- <div style="padding: 10px">
- <el-table
- v-loading="loading"
- :data="tableData"
- ref="workTypeTable"
- max-height="550"
- @selection-change="handleSelectionChange"
- show-summary
- border
- @row-click="handleRowClick"
- :row-style="rowStyle"
- @cell-dblclick="handleDblclick"
- >
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column align="center" label="sorderid" type="index" sortable width="80" />
- <el-table-column
- align="center"
- v-for="(item, index) in tableColumns"
- :key="index"
- :prop="item.ColmCols"
- :label="item.ColmCols"
- :width="flexWidth(item.ColmCols, tableData, item.ColmCols)"
- sortable
- >
- <template slot-scope="{ row, column }">
- <span>{{ row[column.label] }}</span>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="page"
- :limit.sync="pageSize"
- @pagination="currentPage"
- />
- </div>
+ <el-row>
+ <el-col :span="4">
+ <div style="padding: 10px">
+ <el-tree
+ :data="treeData"
+ :props="treeProps"
+ accordion
+ @node-click="handleNodeClick"
+ >
+ </el-tree>
+ </div>
+ </el-col>
+ <el-col :span="20">
+ <div style="padding: 10px">
+ <el-table
+ v-loading="loading"
+ :data="tableData"
+ ref="workTypeTable"
+ max-height="550"
+ @selection-change="handleSelectionChange"
+ show-summary
+ border
+ @row-click="handleRowClick"
+ :row-style="rowStyle"
+ @cell-dblclick="handleDblclick"
+ >
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column
+ align="center"
+ label="sorderid"
+ type="index"
+ sortable
+ width="80"
+ />
+ <el-table-column
+ align="center"
+ v-for="(item, index) in tableColumns"
+ :key="index"
+ :prop="item.ColmCols"
+ :label="item.ColmCols"
+ :width="flexWidth(item.ColmCols, tableData, item.ColmCols)"
+ sortable
+ >
+ <template slot-scope="{ row, column }">
+ <span>{{ row[column.label] }}</span>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="page"
+ :limit.sync="pageSize"
+ @pagination="currentPage"
+ />
+ </div>
+ </el-col>
+ </el-row>
</template>
<script>
@@ -130,9 +151,13 @@
ColmType: "VARCHAR",
},
],
+
+ treeData: [], // 鏍戠姸鍥炬暟鎹�
+ treeProps: {}, // 鏍戠姸鍥惧睘鎬�
};
},
- created() {
+ async created() {
+ await this.getTreeList();
this.getList();
},
props: {
@@ -142,10 +167,31 @@
},
},
methods: {
- // 宸ョ
+ // 鏍戠姸鍥捐妭鐐圭偣鍑讳簨浠�
+ handleNodeClick(e) {
+ console.log(e)
+ this.form.userId = e.id
+ this.getList()
+ },
+ // 鑾峰彇鏍戠姸鍥剧粨鏋�
+ async getTreeList() {
+ this.treeData = []
+ let res = await axios.get(this.baseURL + "/Gy_DutyBill/Gy_DutyBillTreeList");
+ console.log(res.data.data);
+ this.treeData = [...JSON.parse(res.data.data)];
+ Object.assign(this.treeProps, {
+ children: "children",
+ label: 'title',
+ key: 'id'
+ })
+ },
+ // 鑱屽姟
getList() {
let sWhere = "";
this.loading = true;
+ if(this.form.userId){
+ sWhere += " and 缁勭粐鏋舵瀯浠ｇ爜 like'" + this.form.userId + "%' ";
+ }
axios
.get(this.baseURL + "/Gy_DutyBill/Gy_DutyBillList", {
params: { sWhere: sWhere, user: this.user },
diff --git a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
index e3d98b7..93e84a5 100644
--- a/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
+++ b/src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue
@@ -657,9 +657,9 @@
materialShow: false, //鐗╂枡鏁版嵁缁勪欢
deptform: {}, //寮圭獥閫変腑鏁版嵁
openData: false, //鏁版嵁寮圭獥
+ organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //缁勭粐鍒楄〃
dialogTitle: "",
zuzhiId: "",
- organizationList: [], //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
@@ -692,7 +692,7 @@
ColContent1: "",
ColContent2: "",
ColContent: "",
- timeSpan: 29,
+ HInitTimeCycle: 29,
HBeginDate: dayjs(new Date()).subtract(29, "d").format("YYYY-MM-DDTHH:mm:ss"),
HEndDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
},
@@ -750,7 +750,9 @@
uploadTotal: 0,
};
},
- mounted() {},
+ mounted() {
+ this.queryParams.HOrgID = sessionStorage["Organization"];
+ },
created() {
this.riqiChange();
this.getList();
@@ -880,35 +882,6 @@
deptClickSub() {
this.dbEmitData(this.deptform, this.dialogTypeNum);
this.deptform = {};
- },
- fetchData() {
- //鐧诲綍鐢ㄦ埛淇℃伅
- axios
- .get(
- "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
- )
- .then((res) => {
- let data = res.data.data[0];
- this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.queryParams.HOrgID = data.HUSEORGID;
- this.user = data.Czymc;
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((res) => {
- if (res.data.count == 1) {
- this.organizationList = res.data.data; //缁勭粐鍒楄〃
- }
-
- this.handleQuery();
- // this.getList();
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
},
async getList() {
this.tableShow = false;
@@ -1271,20 +1244,14 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
- if (this.queryParams.HNumber) {
- this.sWhere += " and 鐢熶骇璧勬簮浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
- }
- if (this.queryParams.HName) {
- this.sWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + this.queryParams.HName + "%'";
+ if (this.queryParams.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
- if (this.queryParams.HBeginDate && this.queryParams.HEndDate) {
- console.log(this.queryParams.HBeginDate, this.queryParams.HEndDate);
- this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${this.queryParams.HBeginDate}' and CONVERT(varchar(100),鏃ユ湡, 23) <= '${this.queryParams.HEndDate}'`;
- }
- if (this.queryParams.HOrgID) {
- this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
- }
+ // if (this.queryParams.HOrgID) {
+ // this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+ // }
+
this.sWhere += this.addSWhereByOpenType();
// this.sWhere += this.getOrgIDByUser();
this.searchOpen = false;
diff --git a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
index b7234d7..aa62e7f 100644
--- a/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
+++ b/src/views/purchase/cgPoOrderBill/cgPoOrderBill.vue
@@ -68,6 +68,34 @@
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
+ <el-form-item label="涓氬姟鍛�" prop="HEmpName">
+ <el-input
+ v-model="queryParams.HEmpName"
+ placeholder="璇疯緭鍏ヤ笟鍔″憳"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鐗╂枡浠ｇ爜" prop="HMaterNumber">
+ <el-input
+ v-model="queryParams.HMaterNumber"
+ placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鐗╂枡鍚嶇О" prop="HMaterName">
+ <el-input
+ v-model="queryParams.HMaterName"
+ placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="渚涘簲鍟�" prop="HSupName">
+ <el-input
+ v-model="queryParams.HSupName"
+ placeholder="璇疯緭鍏ヤ緵搴斿晢"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-card class="box-card">
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
@@ -209,89 +237,6 @@
</el-collapse>
</el-form>
- <el-row>
- <el-form>
- <el-col :span="4" class="inline">
- <el-form-item label="鏃ユ湡闂撮殧" class="form-item-inline">
- <el-select
- v-model="queryParams.timeSpan"
- placeholder="璇烽�夋嫨鏃ユ湡闂撮殧"
- @change="onDateScanOptionChangerHandler"
- >
- <el-option
- v-for="(item, index) in [
- {
- label: '浠绘剰闂撮殧',
- value: -1,
- },
- {
- label: '浠婂ぉ',
- value: 0,
- },
- {
- label: '杩戜袱澶�',
- value: 1,
- },
- {
- label: '杩戜笁澶�',
- value: 2,
- },
- {
- label: '杩戝洓澶�',
- value: 3,
- },
- {
- label: '杩戜簲澶�',
- value: 4,
- },
- {
- label: '杩戝叚澶�',
- value: 5,
- },
- {
- label: '杩戜竷澶�',
- value: 6,
- },
- {
- label: '杩�30澶�',
- value: 29,
- },
- {
- label: '杩戝崐骞�',
- value: 182,
- },
- {
- label: '杩戜竴骞�',
- value: 365,
- },
- ]"
- :key="item.id"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="4">
- <el-form-item label="寮�濮嬫棩鏈�" class="form-item-inline">
- <el-date-picker
- v-model="queryParams.HBeginDate"
- :disabled="disableDataPicker"
- value-format="yyyy-MM-DD"
- ></el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="4">
- <el-form-item label="缁撴潫鏃ユ湡" class="form-item-inline">
- <el-date-picker
- v-model="queryParams.HEndDate"
- :disabled="disableDataPicker"
- value-format="yyyy-MM-DD"
- ></el-date-picker>
- </el-form-item>
- </el-col>
- </el-form>
- </el-row>
<el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5">
<el-button
@@ -727,7 +672,7 @@
openData: false, //鏁版嵁寮圭獥
dialogTitle: "",
zuzhiId: "",
- organizationList: [], //缁勭粐鍒楄〃
+ organizationList: JSON.parse(sessionStorage.getItem("organizationList")), //缁勭粐鍒楄〃
subDisabled: false, //缂栬緫椤甸潰淇濆瓨鎸夐挳鏄惁绂佺敤(true绂佺敤锛宖alse鍙敤)
OperationType: null, //淇濆瓨绫诲瀷锛堟柊澧�1淇敼3锛�
HInterID: null,
@@ -760,7 +705,7 @@
ColContent1: "",
ColContent2: "",
ColContent: "",
- timeSpan: 29,
+ HInitTimeCycle: 29,
HBeginDate: dayjs(new Date()).subtract(29, "d").format("YYYY-MM-DDTHH:mm:ss"),
HEndDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
},
@@ -818,7 +763,9 @@
uploadTotal: 0,
};
},
- mounted() {},
+ mounted() {
+ this.queryParams.HOrgID = sessionStorage["Organization"];
+ },
created() {
this.riqiChange();
this.getList();
@@ -948,35 +895,6 @@
this.dbEmitData(this.deptform, this.dialogTypeNum);
this.deptform = {};
},
- fetchData() {
- //鐧诲綍鐢ㄦ埛淇℃伅
- axios
- .get(
- "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
- )
- .then((response) => {
- let data = response.data.data[0];
- this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.queryParams.HOrgID = data.HUSEORGID;
- this.user = data.Czymc;
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((response) => {
- if (response.data.count == 1) {
- this.organizationList = response.data.data; //缁勭粐鍒楄〃
- }
-
- this.handleQuery();
- // this.getList();
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
getList() {
this.tableShow = false;
this.loading = true;
@@ -989,7 +907,6 @@
this.sWhere +=
" and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
}
- // this.queryParams.HOrgID = 100038
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
//鐢熶骇璧勬枡鍒楄〃
axios
@@ -1062,8 +979,8 @@
var result = data1.data;
var temp = "";
for (var i = 0; i < result.length; i++) {
- if (temp != result[i]["HItemID"]) {
- temp = result[i]["HItemID"];
+ if (temp != result[i]["hmainid"]) {
+ temp = result[i]["hmainid"];
} else {
result[i].鏃ユ湡 = null;
result[i].鍗曟嵁鍙� = "";
@@ -1342,16 +1259,24 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
- if (this.queryParams.HNumber) {
- this.sWhere += " and 鐢熶骇璧勬簮浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
- }
- if (this.queryParams.HName) {
- this.sWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + this.queryParams.HName + "%'";
+ if (this.queryParams.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
- if (this.queryParams.HBeginDate && this.queryParams.HEndDate) {
- console.log(this.queryParams.HBeginDate, this.queryParams.HEndDate);
- this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${this.queryParams.HBeginDate}' and CONVERT(varchar(100),鏃ユ湡, 23) <= '${this.queryParams.HEndDate}'`;
+ if (this.queryParams.HEmpName) {
+ sWhere += " and 涓氬姟鍛� like '%" + this.queryParams.HEmpName + "%'";
+ }
+
+ if (this.queryParams.HMaterNumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + this.queryParams.HMaterNumber + "%'";
+ }
+
+ if (this.queryParams.HMaterName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + this.queryParams.HMaterName + "%'";
+ }
+
+ if (this.queryParams.HSupName) {
+ sWhere += " and 渚涘簲鍟� like '%" + this.queryParams.HSupName + "%'";
}
// if (this.queryParams.HOrgID) {
// this.sWhere += " and HUSEORGID = '" + this.queryParams.HOrgID + "'";
diff --git a/src/views/sell/XsSeOutStockBackBillList.vue b/src/views/sell/XsSeOutStockBackBillList.vue
index a291e9f..20f63ea 100644
--- a/src/views/sell/XsSeOutStockBackBillList.vue
+++ b/src/views/sell/XsSeOutStockBackBillList.vue
@@ -56,10 +56,40 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo2">
+ <el-input
+ v-model="form.HBillNo2"
+ placeholder="璇疯緭鍏ュ悓姝ュ崟鎹彿"
+ @keyup.enter.native="BillSync"
+ >
+ <el-button slot="append" @click="BillSync">閲嶆柊鍚屾</el-button>
+ </el-input>
+ </el-form-item>
</el-row>
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
+ <el-form-item label="瀹㈡埛" prop="HCusID">
+ <el-input
+ v-model="queryParams.HCusID"
+ placeholder="璇疯緭鍏ュ鎴�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="閮ㄩ棬" prop="HDeptID">
+ <el-input
+ v-model="queryParams.HDeptID"
+ placeholder="璇疯緭鍏ラ儴闂�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="涓荤" prop="HMangerID">
+ <el-input
+ v-model="queryParams.HMangerID"
+ placeholder="璇疯緭鍏ヤ富绠�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-card class="box-card">
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
@@ -742,6 +772,11 @@
this.getList();
},
methods: {
+ BillSync() {
+ axios.get(`${this.baseURL}/Xs_SeOutStockBackBill/Xs_SeOutStockBackBillViewApi`, {
+ params: { BillNo: this.form.HBillno2, BillType: 1403 },
+ });
+ },
onDateScanOptionChangerHandler(e) {
this.queryParams.timeSpan = e;
if (e == -1) {
@@ -829,7 +864,6 @@
// const mmE = String(end.getMonth() + 1).padStart(2, "0"); // 鏈堜唤鏄粠0寮�濮嬬殑
// const ddE = String(end.getDate()).padStart(2, "0");
this.sTime = start;
- console.log(this.queryParams.HInitTimeCycle)
this.eTime = end;
this.dateRange = [this.sTime, this.eTime];
},
@@ -870,35 +904,6 @@
this.dbEmitData(this.deptform, this.dialogTypeNum);
this.deptform = {};
},
- fetchData() {
- //鐧诲綍鐢ㄦ埛淇℃伅
- axios
- .get(
- "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
- )
- .then((res) => {
- let data = res.data.data[0];
- this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.queryParams.HOrgID = data.HUSEORGID;
- this.user = data.Czymc;
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((res) => {
- if (res.data.count == 1) {
- this.organizationList = res.data.data; //缁勭粐鍒楄〃
- }
-
- this.handleQuery();
- // this.getList();
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
async getList() {
this.tableShow = false;
this.loading = true;
@@ -906,6 +911,9 @@
this.pageSize = 50;
}
this.queryParams.HOrgID = sessionStorage["OrganizationID"] - 0;
+ console.log(this.organizationList);
+ let HOrgName = this.organizationList.find((e) => e.ID == this.queryParams.HOrgID)
+ ?.Name;
// this.queryParams.HOrgID = 100038
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
@@ -917,11 +925,13 @@
this.sWhere +=
" and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
}
+
try {
let res = await axios.get(this.baseURL + "/Xs_SeOutStockBill/list_byPage", {
params: {
sWhere: this.sWhere,
user: this.user,
+ Organization: HOrgName,
page: this.page,
size: this.pageSize,
},
@@ -1265,20 +1275,19 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
- if (this.queryParams.HNumber) {
- this.sWhere += " and 鐢熶骇璧勬簮浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
+ if (this.queryParams.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
- if (this.queryParams.HName) {
- this.sWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + this.queryParams.HName + "%'";
+ if (this.queryParams.HCusID) {
+ this.sWhere += " and 瀹㈡埛 like '%" + this.queryParams.HCusID + "%'";
+ }
+ if (this.queryParams.HDeptID) {
+ this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDeptID + "%'";
+ }
+ if (this.queryParams.HMangerID) {
+ this.sWhere += " and 涓荤 like '%" + this.queryParams.HMangerID + "%'";
}
- if (this.queryParams.HBeginDate && this.queryParams.HEndDate) {
- console.log(this.queryParams.HBeginDate, this.queryParams.HEndDate);
- this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${this.queryParams.HBeginDate}' and CONVERT(varchar(100),鏃ユ湡, 23) <= '${this.queryParams.HEndDate}'`;
- }
- if (this.queryParams.HOrgID) {
- this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
- }
this.sWhere += this.addSWhereByOpenType();
// this.sWhere += this.getOrgIDByUser();
this.searchOpen = false;
diff --git a/src/views/sell/XsSeOutStockBill.vue b/src/views/sell/XsSeOutStockBill.vue
index 74874b4..d3f1c43 100644
--- a/src/views/sell/XsSeOutStockBill.vue
+++ b/src/views/sell/XsSeOutStockBill.vue
@@ -41,6 +41,13 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+ <el-form-item label="椤圭洰缂栧彿" prop="HProjectNumber">
+ <el-input
+ v-model="queryParams.HProjectNumber"
+ placeholder="璇疯緭鍏ラ」鐩紪鍙�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-form-item label="缁勭粐">
<el-select
v-model="queryParams.HOrgID"
@@ -56,10 +63,40 @@
</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="鍗曟嵁鍙�" prop="HBillNo2">
+ <el-input
+ v-model="form.HBillNo2"
+ placeholder="璇疯緭鍏ュ悓姝ュ崟鎹彿"
+ @keyup.enter.native="BillSync"
+ >
+ <el-button slot="append" @click="BillSync">閲嶆柊鍚屾</el-button>
+ </el-input>
+ </el-form-item>
</el-row>
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
+ <el-form-item label="瀹㈡埛" prop="HCusID">
+ <el-input
+ v-model="queryParams.HCusID"
+ placeholder="璇疯緭鍏ュ鎴�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="閮ㄩ棬" prop="HDeptID">
+ <el-input
+ v-model="queryParams.HDeptID"
+ placeholder="璇疯緭鍏ラ儴闂�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="涓荤" prop="HMangerID">
+ <el-input
+ v-model="queryParams.HMangerID"
+ placeholder="璇疯緭鍏ヤ富绠�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-card class="box-card">
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
@@ -678,7 +715,7 @@
ColContent1: "",
ColContent2: "",
ColContent: "",
- timeSpan: 29,
+ HInitTimeCycle: 29,
HBeginDate: dayjs(new Date()).subtract(29, "d").format("YYYY-MM-DDTHH:mm:ss"),
HEndDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
},
@@ -738,10 +775,16 @@
},
mounted() {},
created() {
+ this.queryParams.HOrgID = sessionStorage["Organization"];
this.riqiChange();
this.getList();
},
methods: {
+ BillSync() {
+ axios.get(`${this.baseURL}/Xs_SeOutStockBill/Xs_SeOutStockBillViewApi`, {
+ params: { HBillNo: this.form.HBillNo2, BillType: 1402 },
+ });
+ },
onDateScanOptionChangerHandler(e) {
this.queryParams.timeSpan = e;
if (e == -1) {
@@ -867,56 +910,28 @@
this.dbEmitData(this.deptform, this.dialogTypeNum);
this.deptform = {};
},
- fetchData() {
- //鐧诲綍鐢ㄦ埛淇℃伅
- axios
- .get(
- "http://47.96.97.237/API/Web/GetUser?UserName=001&PassWord=123456&HOrgName=100038"
- )
- .then((res) => {
- let data = res.data.data[0];
- this.zuzhiId = data.HUSEORGID; //鏍规嵁鐧诲綍鐢ㄦ埛鑾峰彇榛樿鐨勭粍缁嘔D
- this.queryParams.HOrgID = data.HUSEORGID;
- this.user = data.Czymc;
- axios
- .get(this.baseURL + "/Web/GetOrganizations", {})
- .then((res) => {
- if (res.data.count == 1) {
- this.organizationList = res.data.data; //缁勭粐鍒楄〃
- }
- this.handleQuery();
- // this.getList();
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- })
- .catch((error) => {
- this.$modal.msgError("鎺ュ彛璇锋眰澶辫触!");
- });
- },
async getList() {
this.tableShow = false;
this.loading = true;
if (this.pageSize == 0) {
this.pageSize = 50;
}
- this.queryParams.HOrgID = sessionStorage["OrganizationID"]
// this.queryParams.HOrgID = 100038
// this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '2020-01-01' and CONVERT(varchar(100),鏃ユ湡, 23) <= '2030-01-01'`;
// 鏀舵枡閫氱煡鍗曞垪琛�
-
+
if (this.dateRange.length > 0) {
this.sWhere +=
" and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.dateRange[0] + "'";
this.sWhere +=
" and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + this.dateRange[1] + "'";
}
- console.log()
- let Organization = this.organizationList.find(e => e.ID = this.queryParams.HOrgID)?.Name
- try{
+ let Organization = this.organizationList.find(
+ (e) => (e.ID = this.queryParams.HOrgID)
+ )?.Name;
+ try {
let res = await axios.get(this.baseURL + "/Xs_SeOutStockBill/list_byPage", {
params: {
sWhere: this.sWhere,
@@ -1265,20 +1280,31 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
- if (this.queryParams.HNumber) {
- this.sWhere += " and 鐢熶骇璧勬簮浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
- }
- if (this.queryParams.HName) {
- this.sWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + this.queryParams.HName + "%'";
+ if (this.queryParams.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HNumber + "%'";
}
- if (this.queryParams.HBeginDate && this.queryParams.HEndDate) {
- console.log(this.queryParams.HBeginDate, this.queryParams.HEndDate);
- this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${this.queryParams.HBeginDate}' and CONVERT(varchar(100),鏃ユ湡, 23) <= '${this.queryParams.HEndDate}'`;
+ if (this.queryParams.HProjectNumber) {
+ this.sWhere += " and 椤圭洰缂栫爜 like '%" + this.queryParams.HProjectNumber + "%'";
}
- if (this.queryParams.HOrgID) {
- this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+
+ if (this.queryParams.HCusID) {
+ this.sWhere += " and 瀹㈡埛 like '%" + this.queryParams.HCusID + "%'";
}
+ if (this.queryParams.HDeptID) {
+ this.sWhere += " and 閮ㄩ棬 like '%" + this.queryParams.HDeptID + "%'";
+ }
+ if (this.queryParams.HMangerID) {
+ this.sWhere += " and 涓荤 like '%" + this.queryParams.HMangerID + "%'";
+ }
+
+ // if (this.queryParams.HBeginDate && this.queryParams.HEndDate) {
+ // console.log(this.queryParams.HBeginDate, this.queryParams.HEndDate);
+ // this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${this.queryParams.HBeginDate}' and CONVERT(varchar(100),鏃ユ湡, 23) <= '${this.queryParams.HEndDate}'`;
+ // }
+ // if (this.queryParams.HOrgID) {
+ // this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+ // }
this.sWhere += this.addSWhereByOpenType();
// this.sWhere += this.getOrgIDByUser();
this.searchOpen = false;
diff --git a/src/views/sell/sellOutBill/index.vue b/src/views/sell/sellOutBill/index.vue
index 53edea6..be1bc43 100644
--- a/src/views/sell/sellOutBill/index.vue
+++ b/src/views/sell/sellOutBill/index.vue
@@ -353,6 +353,7 @@
this.sTime = yyyyS + '-' + mmS + '-' + ddS
this.eTime = yyyyE + '-' + mmE + '-' + ddE
this.dateRange = [this.sTime, this.eTime]
+ console.log(dateRange)
},
getList() {
this.tableShow = false
diff --git a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
index 2330d2c..12a48a4 100644
--- a/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
+++ b/src/views/sell/xsSeOrderBill/xsSeOrderBill.vue
@@ -60,6 +60,27 @@
<el-collapse v-model="activeSeach">
<el-collapse-item title="鏇村" name="1">
+ <el-form-item label="瀹㈡埛" prop="HCusID">
+ <el-input
+ v-model="queryParams.HCusID"
+ placeholder="璇疯緭鍏ュ鎴�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鐗╂枡浠ｇ爜" prop="HMaterNumber">
+ <el-input
+ v-model="queryParams.HMaterNumber"
+ placeholder="璇疯緭鍏ョ墿鏂欎唬鐮�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鐗╂枡鍚嶇О" prop="HMaterName">
+ <el-input
+ v-model="queryParams.HMaterName"
+ placeholder="璇疯緭鍏ョ墿鏂欏悕绉�"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
<el-card class="box-card">
<div slot="header" class="clearfix"><span>杩囨护</span></div>
<div>
@@ -590,7 +611,7 @@
},
data() {
return {
- activeSeach: '',
+ activeSeach: "",
HModName: "Cg_POOrderBillList",
editShow: false,
openEdit: false,
@@ -669,7 +690,7 @@
dateRange: [],
// 鏌ヨ鍙傛暟
queryParams: {
- HOrgID: null,
+ HOrgID: sessionStorage["Organization"],
HName: null,
HNumber: null,
Comparator1: "",
@@ -678,7 +699,7 @@
ColContent1: "",
ColContent2: "",
ColContent: "",
- timeSpan: 29,
+ HInitTimeCycle: 29,
HBeginDate: dayjs(new Date()).subtract(29, "d").format("YYYY-MM-DDTHH:mm:ss"),
HEndDate: dayjs(new Date()).format("YYYY-MM-DDTHH:mm:ss"),
},
@@ -736,7 +757,9 @@
uploadTotal: 0,
};
},
- mounted() {},
+ mounted() {
+ this.queryParams.HOrgID = sessionStorage["Organization"];
+ },
created() {
this.riqiChange();
this.getList();
@@ -1259,20 +1282,26 @@
}
this.sWhere += " and " + this.queryParams.ColName2 + " " + com2;
}
- if (this.queryParams.HNumber) {
- this.sWhere += " and 鐢熶骇璧勬簮浠ｇ爜 like '%" + this.queryParams.HNumber + "%'";
- }
- if (this.queryParams.HName) {
- this.sWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + this.queryParams.HName + "%'";
+ if (this.queryParams.HBillNo) {
+ this.sWhere += " and 鍗曟嵁鍙� like '%" + this.queryParams.HBillNo + "%'";
}
- if (this.queryParams.HBeginDate && this.queryParams.HEndDate) {
- console.log(this.queryParams.HBeginDate, this.queryParams.HEndDate);
- this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${this.queryParams.HBeginDate}' and CONVERT(varchar(100),鏃ユ湡, 23) <= '${this.queryParams.HEndDate}'`;
+ if (this.queryParams.HCusID) {
+ this.sWhere += " and 瀹㈡埛 like ''%" + this.queryParams.HCusID + "%''";
}
- if (this.queryParams.HOrgID) {
- this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+ if (this.queryParams.HMaterNumber) {
+ this.sWhere += " and 鐗╂枡浠ｇ爜 like ''%" + this.queryParams.HMaterNumber + "%''";
}
+ if (this.queryParams.HMaterName) {
+ this.sWhere += " and 鐗╂枡鍚嶇О like ''%" + this.queryParams.HMaterName + "%''";
+ }
+
+ // if (this.queryParams.HBeginDate && this.queryParams.HEndDate) {
+ // this.sWhere += ` and CONVERT(varchar(100),鏃ユ湡, 23) >= '${this.queryParams.HBeginDate}' and CONVERT(varchar(100),鏃ユ湡, 23) <= '${this.queryParams.HEndDate}'`;
+ // }
+ // if (this.queryParams.HOrgID) {
+ // this.sWhere += " and HOrgID = '" + this.queryParams.HOrgID + "'";
+ // }
this.sWhere += this.addSWhereByOpenType();
// this.sWhere += this.getOrgIDByUser();
this.searchOpen = false;
--
Gitblit v1.9.1