diff --git a/src/api/contract/contract.js b/src/api/contract/contract.js
index 46b6c74..52e946b 100644
--- a/src/api/contract/contract.js
+++ b/src/api/contract/contract.js
@@ -1,10 +1,11 @@
import request from "@/utils/request";
-export function getContract(params){
+export function getContract(params,noloading = false){
return request({
method:'get',
url:'/api/admin/contract/index',
- params
+ params,
+ noloading
})
}
@@ -48,10 +49,11 @@ export function checkContractName(params){
})
}
-export function updateStatus(params){
+export function updateStatus(params,noloading = true){
return request({
method:'get',
url:'api/admin/oa/update-contract',
- params
+ params,
+ noloading
})
}
diff --git a/src/api/out/index.js b/src/api/out/index.js
index 4c02f6a..adb2214 100644
--- a/src/api/out/index.js
+++ b/src/api/out/index.js
@@ -15,7 +15,7 @@ export function getOutDetail({ tbname,out_caigou_id,out_contract_id,out_pay_id,o
})
}
-export function httpCurl({ tbname,out_caigou_id,out_contract_id,out_pay_id,out_zhaobiao_id }) {
+export function httpCurl({ tbname,out_caigou_id,out_contract_id,out_pay_id,out_zhaobiao_id },noloading = true) {
return request({
method: 'post',
url: '/api/admin/other/http-curl',
@@ -29,6 +29,7 @@ export function httpCurl({ tbname,out_caigou_id,out_contract_id,out_pay_id,out_z
out_pay_id,
out_zhaobiao_id
}
- }
+ },
+ noloading
})
}
diff --git a/src/components/XySelectors/index.vue b/src/components/XySelectors/index.vue
new file mode 100644
index 0000000..c86f362
--- /dev/null
+++ b/src/components/XySelectors/index.vue
@@ -0,0 +1,225 @@
+
+
+
+
+
diff --git a/src/main.js b/src/main.js
index de21973..2d2f548 100644
--- a/src/main.js
+++ b/src/main.js
@@ -40,7 +40,8 @@ import xyTable from "@/components/XyTable"
Vue.component('xy-table',xyTable)
import xyDialog from "@/components/XyDialog"
Vue.component('xy-dialog',xyDialog)
-
+import xySelectors from "@/components/XySelectors"
+Vue.component('xy-selectors',xySelectors)
Vue.config.productionTip = false
import moment from 'moment'
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 8905018..4517eb3 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -3,7 +3,7 @@
@import './transition.scss';
@import './element-ui.scss';
@import './sidebar.scss';
-
+$primaryColor: #338de3;
body {
height: 100%;
-moz-osx-font-smoothing: grayscale;
diff --git a/src/views/contract/contractList.vue b/src/views/contract/contractList.vue
index bcc4d2b..4c2193e 100644
--- a/src/views/contract/contractList.vue
+++ b/src/views/contract/contractList.vue
@@ -19,12 +19,13 @@
/>
-
-
+
+
-
-
预算计划
+
+ 预算计划
-
+
-
-
- 签订年份
-
+
+
+ 签订年份
+
(select.year = e)"
>
-
-
- 创建日期
-
+
+
+ 创建日期
+
-
+
-
- 项目类型
-
-
+
+ 项目类型
+
+
-
- 业务科室
-
-
-
-
-
+
+ 业务科室
+
+
+
+
+
-
- 采购形式
-
-
+
+ 采购形式
+
+
-
- 采购方式
-
-
+
+ 采购方式
+
+
-
- 预算金额
-
- -
-
-
+
+ 预算金额
+
+ -
+
+
-
- 合同状态
-
+ :key="item.value"
+ :value="item.value"
+ >{{ item.label }}
+
+
+
-
+
招标流程状态
-
-
-
+
+
+
采购流程状态
-
-
-
+
+
+
合同会签状态
-
-
-
+
+
+
请示流程状态
-
-
+
+
+
+
-
@@ -1072,7 +1053,7 @@ import { getparameter } from "@/api/system/dictionary";
import { listdeptNoAuth } from "@/api/system/department";
import { getBudget } from "@/api/budget/budget";
import { getOatoken } from "@/api/oatoken";
-import { parseTime, resetSelect } from "@/utils";
+import { deepCopy, parseTime, resetSelect } from '@/utils'
import { Message } from "element-ui";
import { getInfo } from "@/api/user.js";
import { getToken } from "@/utils/auth";
@@ -1222,8 +1203,25 @@ export default {
department_id: "",
purchaseModality: "",
purchaseMethods: "",
- priceMin: null,
- priceMax: null,
+ status: "",
+ year: "",
+ plan_id: "",
+ outcome_type: 1,
+ plan_name: "请选择预算计划",
+ start_plan_price: undefined,
+ end_plan_price: undefined,
+ },
+ selectCopy: {
+ keyword: "",
+ showDatePicker: "",
+ pageIndex: 1,
+ pageSize: 10,
+ startDate: "",
+ endDate: "",
+ type: "",
+ department_id: "",
+ purchaseModality: "",
+ purchaseMethods: "",
status: "",
year: "",
plan_id: "",
@@ -1833,6 +1831,9 @@ export default {
};
},
methods: {
+ reset () {
+ this.select = deepCopy(this.selectCopy)
+ },
toExport() {
this.select.is_export = 1;
this.getContracts(true);
@@ -2254,13 +2255,13 @@ export default {
this.getContracts();
},
//获取合同列表
- async getContracts(is_export) {
+ async getContracts(is_export,noloading=false) {
const res = await getContract({
page_size: this.select.pageSize,
page: this.select.pageIndex,
is_auth: 1,
...this.select,
- });
+ },noloading);
let tokens = getToken();
if (is_export && this.select.is_export == 1) {
@@ -2576,8 +2577,8 @@ export default {
flow_type: flowTypeMap.get(this.nowContract.tbname),
out_contract_id: this.nowContract.id,
status: getStatus(res.flow?.current_step),
- });
- await this.getContracts();
+ },true);
+ await this.getContracts(false,true);
}
};
},
@@ -2652,4 +2653,20 @@ export default {
content: "(元)";
}
}
+
+.select-content {
+ display: flex;
+ flex-wrap: wrap;
+
+ & > div {
+ flex-basis: 45%;
+
+ margin: 5px;
+
+ & > span:nth-child(1) {
+ display: inline-block;
+ width: 140px;
+ }
+ }
+}
diff --git a/src/views/contract/seeContract.vue b/src/views/contract/seeContract.vue
index 8a63279..57c0390 100644
--- a/src/views/contract/seeContract.vue
+++ b/src/views/contract/seeContract.vue
@@ -10,158 +10,163 @@
-
-
服务商/供应商
-
+
+
+
+ 服务商/供应商
+
-
-
- 预算计划
+
+
+ 预算计划
-
+
+ style="width: 200px" @on-clear="clearSelectForSearch" />
-
-
- 签订年份
-
+
+
+ 签订年份
+
select.year = e">
+ @on-change="(e)=>select.year = e">
-
-
- 创建日期
-
+
+
+ 创建日期
+
+ style="width: 200px" type="daterange" @on-change="datePick">
-
-
- 保函有效期
-
+
+
+ 保函有效期
+
+ style="width: 200px" type="daterange" @on-change="datePickBao">
-
+
-
+
保函金额
-
- -
-
-
+
+
-
+
+
-
+
项目类型
-
-
+
+
-
+
业务科室
-
-
-
-
-
+
+
+
+
+
-
+
采购形式
-
-
+
+
-
+
采购方式
-
-
+
+
-
+
预算金额
-
- -
-
-
+
+
-
+
+
-
+
合同状态
-
-
-
-
+
+
+
+
履约保函状态
-
-
-
+
+
+
招标流程状态
-
-
-
+
+
+
采购流程状态
-
-
-
+
+
+
合同会签状态
-
-
-
+
+
+
请示流程状态
-
-
+
+
+
+
+