no message

components/en-utils/en-nav/en-nav.vue

@@ -94,6 +94,10 @@
 				type: Boolean,
 				default: true
 			},
+      toBack: {
+        type: Boolean,
+        default: true
+      },
 			is_fixed: {
 				type: Boolean,
 				default: false
@@ -135,7 +139,10 @@
 		methods: {
 			// 左侧返回按钮调用
 			onBack() {
-				uni.navigateBack()
+        console.log('toBack:',this.toBack)
+        if(this.toBack){
+          uni.navigateBack()
+        }
 				this.$emit('onBack')
 			},
 			getTopBg(type) {

page_task/information/information.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="total-page page-box task-bg">
-		<Nav :title="productInfo.product_name" :genre="1" is_fixed></Nav>
+		<Nav :title="productInfo.product_name" :genre="1" :toBack="false" @onBack="delBusinessCache" is_fixed></Nav>
 		<view class="task-tabs" :style="{top:`${$tools.topHeight()}px`}">
 			<view class="m-t20">
 				<view class="creation_item row-justify-sb center sys-background-fff m-lr30 m-b20 p-30 r-20"
@@ -356,12 +356,34 @@
 							uni.$emit('setClientData', this.taskData.clientInfo)
 						}
 						if (res.data.propertyList) {
-							this.taskData.property = res.data.propertyList
-							if (this.taskData.property) {
-								this.taskData.property.forEach((item) => {
-									item.id = ''
-								})
-							}
+              // this.taskData.property=[]
+              // let pKey=[]
+              // for (const informationKey in this.informationList) {
+              //   if(this.informationList[informationKey].type===2){
+              //     pKey=this.informationList[informationKey].type_keys
+              //   }
+              // }
+              // res.data.propertyList.forEach(item=>{
+              //   item.id = ''
+              //   if(item.property_type*1===1){
+              //     if(pKey.indexOf('house_item')>=0){
+              //       this.taskData.property.push(item)
+              //     }
+              //   }else if(item.property_type*1===2){
+              //     if(pKey.indexOf('car_item')>=0){
+              //       this.taskData.property.push(item)
+              //     }
+              //   }else if(item.property_type*1===3){
+              //     if(pKey.indexOf('insurance_item')>=0){
+              //       this.taskData.property.push(item)
+              //     }
+              //   }else if(item.property_type*1===4){
+              //     if(pKey.indexOf('firm_item')>=0){
+              //       this.taskData.property.push(item)
+              //     }
+              //   }
+              // })
+
 						}
 						if (res.data.applyFor) {
 							res.data.applyFor.id = ''
@@ -484,7 +506,6 @@
 					}
 					if (res.data.linkman) {
 						this.taskData.linkman = res.data.linkman
-						console.log('this.taskData.linkman:', this.taskData.linkman)
 					}
 					if (res.data.credit) {
 						this.taskData.credit = res.data.credit

page_task/property/components/company.vue

@@ -73,25 +73,25 @@
             </image>
           </view>
         </view>
-			<en-input label="企业名称" type="text" v-model="item.firm_name" v-if="verifyKey('firm_name')"
+			<en-input label="企业名称" type="text" v-model="item.data.firm_name" v-if="verifyKey('firm_name')"
 				placeholder="请输入公司名称"></en-input>
-			<en-date label="成立时间" v-model="item.establish_date" v-if="verifyKey('establish_date')"
+			<en-date label="成立时间" v-model="item.data.establish_date" v-if="verifyKey('establish_date')"
 				placeholder="选择成立时间"></en-date>
-			<en-input label="年交费额" v-model="item.year_money" v-if="verifyKey('year_money')" type="number"
+			<en-input label="年交费额" v-model="item.data.year_money" v-if="verifyKey('year_money')" type="number"
 				placeholder="请输入年交费额" rightText="元"></en-input>
-			<en-city label="实际经营地" v-model="item.establish_city" v-if="verifyKey('establish_city')"
+			<en-city label="实际经营地" v-model="item.data.establish_city" v-if="verifyKey('establish_city')"
 				placeholder="请选择省、市、区"></en-city>
-			<en-input label="经营详细地址" v-model="item.establish_address" v-if="verifyKey('establish_address')" type="text"
+			<en-input label="经营详细地址" v-model="item.data.establish_address" v-if="verifyKey('establish_address')" type="text"
 				placeholder="请输入经营详细地址"></en-input>
-			<en-upload label="上传企业相关图片" v-model="item.firm_img" v-if="verifyKey('firm_img')"
+			<en-upload label="上传企业相关图片" v-model="item.data.firm_img" v-if="verifyKey('firm_img')"
 				:imageWidth="180"></en-upload>
-			<en-input label="年交税额" v-model="item.year_tax" v-if="verifyKey('year_tax')" type="number"
+			<en-input label="年交税额" v-model="item.data.year_tax" v-if="verifyKey('year_tax')" type="number"
 				placeholder="请输入年交税额" rightText="元"></en-input>
-			<en-input label="年开票额" v-model="item.year_invoice" v-if="verifyKey('year_invoice')" type="number"
+			<en-input label="年开票额" v-model="item.data.year_invoice" v-if="verifyKey('year_invoice')" type="number"
 				placeholder="请输入年开票额" rightText="元"></en-input>
-			<en-select label="税务等级" v-model="item.tax_grade" v-if="verifyKey('tax_grade')" placeholder="请选择税务等级"
+			<en-select label="税务等级" v-model="item.data.tax_grade" v-if="verifyKey('tax_grade')" placeholder="请选择税务等级"
 				:local-data="taxGradeData"></en-select>
-			<en-radio label="税务有无断缴" v-model="item.is_end_tax" v-if="verifyKey('is_end_tax')" :radio-data="endData"
+			<en-radio label="税务有无断缴" v-model="item.data.is_end_tax" v-if="verifyKey('is_end_tax')" :radio-data="endData"
 				:noBox="true"></en-radio>
       </view>
 		</view>
@@ -144,11 +144,11 @@
 			return {
         editIndex:0,
 				endData: [{
-					'id': 1,
-					'name': '有'
+					'value': 1,
+					'text': '有'
 				}, {
-					'id': 0,
-					'name': '无'
+					'value': 0,
+					'text': '无'
 				}],
 				taxGradeData: [],
 				firmItem: {

page_task/property/components/guarantee.vue

@@ -57,19 +57,19 @@
             </image>
           </view>
         </view>
-        <en-input label="保险公司" type="text" placeholder="请输入保险公司名称" v-model="item.insurance_name"
+        <en-input label="保险公司" type="text" placeholder="请输入保险公司名称" v-model="item.data.insurance_name"
                   v-if="verifyKey('insurance_name')"></en-input>
-        <en-select label="保险类型" placeholder="请选择保险类型" v-model="item.insurance_type"
+        <en-select label="保险类型" placeholder="请选择保险类型" v-model="item.data.insurance_type"
                    v-if="verifyKey('insurance_type')" :local-data="insuranceTypeData"></en-select>
-        <en-input label="年交费额" type="number" v-model="item.year_money" v-if="verifyKey('year_money')"
+        <en-input label="年交费额" type="number" v-model="item.data.year_money" v-if="verifyKey('year_money')"
                   placeholder="请输入年交费额" rightText="元"></en-input>
-        <en-radio label="满足缴费情况" v-model="item.is_fees" v-if="verifyKey('is_fees')"
+        <en-radio label="满足缴费情况" v-model="item.data.is_fees" v-if="verifyKey('is_fees')"
                   :radio-data="payData"></en-radio>
-        <en-date label="保单有效期" v-model="item.validity_date" v-if="verifyKey('validity_date')"
+        <en-date label="保单有效期" v-model="item.data.validity_date" v-if="verifyKey('validity_date')"
                  item="选择保单有效期"></en-date>
-        <en-upload label="上传保单相关图片" v-model="insuranceItem.insurance_img" v-if="verifyKey('insurance_img')"
+        <en-upload label="上传保单相关图片" v-model="item.data.insurance_img" v-if="verifyKey('insurance_img')"
                    :imageWidth="180"></en-upload>
-        <en-input label="备注" v-model="item.remark" v-if="verifyKey('remark')" type="text" placeholder="请输入备注信息"
+        <en-input label="备注" v-model="item.data.remark" v-if="verifyKey('remark')" type="text" placeholder="请输入备注信息"
                   :noBox="true"></en-input>
       </view>
     </view>

page_task/property/property.vue

@@ -137,11 +137,11 @@
 						if (item.property_type * 1 === 1) {
 							this.houseList.push(item)
 						} else if (item.property_type * 1 === 2) {
-							this.carList.push(item)
+             this.carList.push(item)
 						} else if (item.property_type * 1 === 3) {
-							this.insuranceList.push(item)
+              this.insuranceList.push(item)
 						} else if (item.property_type * 1 === 4) {
-							this.firmList.push(item)
+             this.firmList.push(item)
 						}
 					})
 				}

pages/statistics/components/performance_stat.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<StatSingleData ref="workTotalObj"></StatSingleData>
+		<StatSingleData ref="workTotalObj" :total-num="totalNum" :total-money="totalMoney"></StatSingleData>
 		<StatLoanChart ref="workChartObj" :leftText="'任务汇总占比'"></StatLoanChart>
 		<StatRanking ref="workListObj" :is_type="3" :leftText="'放款汇总明细'"></StatRanking>
 	</view>
@@ -45,7 +45,8 @@
 		data() {
 			return {
 				workList: [],
-        totalNum:0
+        totalNum:0,
+        totalMoney:0,
 			}
 		},
 		methods: {
@@ -68,6 +69,7 @@
 				getUserPerformance(this.dateTypeObj).then((res) => {
 					if (res.code === 1) {
             this.totalNum=res.data.totalNum
+            this.totalMoney=res.data.totalMoney
 						this.$refs.workChartObj.setPeakChartData(res.data.items)
 						this.$refs.workListObj.setDataList(res.data.items)
 					}

pages/statistics/components/task_stat.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="">
-		<StatSingleData :genre="1"></StatSingleData>
+		<StatSingleData :genre="1" :total-num="totalNum"></StatSingleData>
 		<StatLoanChart ref="workChartObj" :leftText="'任务汇总占比'"></StatLoanChart>
 		<StatRanking ref="workListObj" :is_type="3" :leftText="'任务明细'"></StatRanking>
 	</view>
@@ -44,7 +44,8 @@
 		},
 		data() {
 			return {
-				workList: []
+				workList: [],
+        totalNum:0
 			}
 		},
 		methods: {
@@ -65,6 +66,7 @@
 			getUserWorkload() {
 				getUserWorkload(this.dateTypeObj).then((res) => {
 					if (res.code === 1) {
+            this.totalNum=res.data.totalNum
 						this.$refs.workChartObj.setPeakChartData(res.data.items)
 						this.$refs.workListObj.setDataList(res.data.items)
 					}