diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index eae9791..9551f23 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -18,7 +18,7 @@
- {{(datas.extend.transaction.arr.total_price?datas.extend.transaction.arr.total_price:0)+'元/'+(datas.extend.transaction.arr.day_money?datas.extend.transaction.arr.day_money:0)+'元'}}
+ {{(datas.extend.transaction.arr.day_money?datas.extend.transaction.arr.day_money:0)+'元/'+(datas.extend.transaction.arr.total_price?datas.extend.transaction.arr.total_price:0)+'元'}}
进行中
diff --git a/static/server/contract.js b/static/server/contract.js
new file mode 100644
index 0000000..2a661d7
--- /dev/null
+++ b/static/server/contract.js
@@ -0,0 +1,2 @@
+export const companyContractType = [23,24,25]
+export const personnerContractType = [19,20,21,22]
\ No newline at end of file
diff --git a/subpkg/companySign/companySign.vue b/subpkg/companySign/companySign.vue
index d6c878d..514c1ee 100644
--- a/subpkg/companySign/companySign.vue
+++ b/subpkg/companySign/companySign.vue
@@ -64,6 +64,7 @@
import { companyView, initiateContract, Draftingcontracts, postsms } from "@/api/company.js"
import { dictDataLists } from "@/api/oaPbulic.js"
import { Toast } from "../../libs/uniApi";
+ import {companyContractType} from "@/static/server/contract.js";
export default {
data() {
return {
@@ -122,6 +123,9 @@
let res = await dictDataLists({
type_id: 7
})
+ res.data = res.data.filter(item=>{
+ return companyContractType.find(t=>item.id==t);
+ })
this.contractTypeList = res.data;
},
// 生成合同
diff --git a/subpkg/contract/contract.vue b/subpkg/contract/contract.vue
index 43c1879..fd39243 100644
--- a/subpkg/contract/contract.vue
+++ b/subpkg/contract/contract.vue
@@ -11,8 +11,6 @@
-->
-
-
@@ -22,15 +20,15 @@
甲方 :
- { item.name }
+ {{item.party_a_info.company_name}}
乙方 :
- { item.phone }
+ {{item.party_b_info.company_name}}
合同类型 :
- {{item.company.contract_type_name}}
+ {{item.contract_type_name}}
合同编号 :
@@ -50,7 +48,7 @@
- {{item.company.contract_type_name}}
+ {{item.contract_type_name||'合同'}}
{{item.update_time}}
@@ -144,12 +142,6 @@
onShow() {
this.initLoadConfig();
},
- onReady() {
- uni.setNavigationBarColor({
- frontColor: '#ffffff',
- backgroundColor: '#3175f9'
- })
- },
methods: {
navTo(url) {
url ?
diff --git a/subpkg/contractDetail/contractDetail.vue b/subpkg/contractDetail/contractDetail.vue
index 2ba0182..66a730e 100644
--- a/subpkg/contractDetail/contractDetail.vue
+++ b/subpkg/contractDetail/contractDetail.vue
@@ -17,12 +17,6 @@
onLoad(options) {
this.id = options.id
},
- onReady() {
- uni.setNavigationBarColor({
- frontColor: '#ffffff',
- backgroundColor: '#3175f9'
- })
- },
onShow() {},
methods: {
navTo(url) {
diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue
index 297c5e5..1cf7bc9 100644
--- a/subpkg/personnelDetails/personnelDetails.vue
+++ b/subpkg/personnelDetails/personnelDetails.vue
@@ -474,6 +474,7 @@ import {
import {
download_file
} from "@/api/junziqian.js"
+ import {personnerContractType} from "@/static/server/contract.js";
export default {
data () {
return {
@@ -571,6 +572,9 @@ export default {
let res = await dictDataLists({
type_id: 7
})
+ res.data = res.data.filter(item=>{
+ return personnerContractType.find(t=>item.id==t);
+ })
this.contractTypeList = res.data;
},
// 生成合同