Merge branch 'main' of http://git.excellentkk.cn/mkm/OfficeApp

components/task/taskItem.vue

@@ -18,7 +18,7 @@
 									</block>
 									<block
 										v-else-if="datas.extend&&datas.extend.transaction&&datas.extend.transaction.arr">
-										{{(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)+'元'}}
 									</block>
 									<block v-else>进行中</block>
 								</block>

static/server/contract.js

@@ -0,0 +1,2 @@
+export const companyContractType = [23,24,25]
+export const personnerContractType = [19,20,21,22]

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;
       },
       // 生成合同

subpkg/contract/contract.vue

@@ -11,8 +11,6 @@
     </view> -->
 		<view class="contract_list">
 			<view class="item" v-for="(item,index) in list" :key="item.id">
-
-
 				<view class="personnel_list">
 					<view class="cards">
 						<view class="cards_head">
@@ -22,15 +20,15 @@
 							<view class="right">
 								<view class="">
 									<text>甲方 :</text>
-									<text> { item.name }</text>
+									<text> {{item.party_a_info.company_name}}</text>
 								</view>
 								<view class="">
 									<text>乙方 :</text>
-									<text>{ item.phone }</text>
+									<text>{{item.party_b_info.company_name}}</text>
 								</view>
 								<view class="">
 									<text>合同类型 :</text>
-									<text> {{item.company.contract_type_name}} </text>
+									<text> {{item.contract_type_name}} </text>
 								</view>
 								<view class="">
 									<text>合同编号 :</text>
@@ -50,7 +48,7 @@
 							<view class="left">
 								<image class="contract_img" src="../../static/img/contract/pdf.png"></image>
 								<view class="text">
-									<view class="name">{{item.company.contract_type_name}}</view>
+									<view class="name">{{item.contract_type_name||'合同'}}</view>
 									<view>
 										<text>{{item.update_time}}</text>
 									</view>
@@ -144,12 +142,6 @@
 		onShow() {
 			this.initLoadConfig();
 		},
-		onReady() {
-			uni.setNavigationBarColor({
-				frontColor: '#ffffff',
-				backgroundColor: '#3175f9'
-			})
-		},
 		methods: {
 			navTo(url) {
 				url ?

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) {

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;
     },
     // 生成合同