瀏覽代碼

no message

USER-20230908AJ\Administrator 1 年之前
父節點
當前提交
ee6a1b4366

+ 13 - 4
components/en-utils/en-button/en-button.vue

@@ -1,16 +1,26 @@
 <template>
 	<view :style="[{lineHeight:height}]">
-		<view class="p-t20 p-lr30" :class="is_fixed?'fixed-button':''" v-if="!is_both">
+		<view class="p-t20 p-lr30" :class="is_fixed?'fixed-button':''" v-if="is_both===0">
 			<button class="en-button button-background sys-weight-500" type="default" hover-class="is-hover"
 				:style="[{width},{borderRadius},{fontSize},{color}]" @click="onSubmit">{{text}}</button>
 		</view>
-		<view class="row-justify-sb center p-lr30 p-t20" :class="is_fixed?'fixed-button':''" v-else>
+		<view class="row-justify-sb center p-lr30 p-t20" :class="is_fixed?'fixed-button':''" v-else-if="is_both===1">
 			<button class="en-button-left button-background button-color sys-weight-500 m-r30" type="default"
 				hover-class="is-hover" :style="[{width:bothWidth},{borderRadius},{fontSize}]"
 				@click="onLeftSubmit">{{leftText}}</button>
 			<button class="en-button button-background sys-weight-500" type="default" hover-class="is-hover"
 				:style="[{width:bothWidth},{borderRadius},{fontSize},{color}]" @click="onSubmit">{{rightText}}</button>
 		</view>
+    <view class="row-justify-sb center p-lr30 p-t20" :class="is_fixed?'fixed-button':''" v-else-if="is_both===2">
+      <button class="en-button-left button-background button-color sys-weight-500 m-r30" type="default"
+              hover-class="is-hover" :style="[{width:'33%'},{borderRadius},{fontSize}]"
+              @click="onLeftSubmit">{{leftText}}</button>
+      <button class="en-button-left button-background button-color sys-weight-500 m-r30" type="default"
+              hover-class="is-hover" :style="[{width:'33%'},{borderRadius},{fontSize}]"
+              @click="onCentreSubmit">{{centreText}}</button>
+      <button class="en-button button-background sys-weight-500" type="default" hover-class="is-hover"
+              :style="[{width:'33%'},{borderRadius},{fontSize},{color}]" @click="onSubmit">{{rightText}}</button>
+    </view>
 	</view>
 </template>
 
@@ -18,8 +28,7 @@
 	export default {
 		props: {
 			is_both: {
-				type: Boolean,
-				default: false
+				default: 0
 			},
 			is_fixed: {
 				type: Boolean,

+ 9 - 5
components/en-utils/en-select/en-select.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="select">
+	<view class="select sys-background-fff ">
 		<view class="title p-30 row-justify-sb">
 			<view class="icon"></view>
 			<text class="size-30 sys-weight-600">{{title}}</text>
@@ -16,7 +16,7 @@
 				</view>
 			</scroll-view>
 		</view>
-		<EnButton :is_fixed="false" text="确认"  @onSubmit="setAffirm(true)" @onLeftSubmit="setAffirm(false)"></EnButton>
+		<EnButton :is_fixed="true" text="确认"  @onSubmit="setAffirm(true)" ></EnButton>
 	</view>
 </template>
 
@@ -50,7 +50,8 @@
 		},
 		data() {
 			return {
-				current: 3,
+				current: -1,
+        newValue:0
 			};
 		},
 		watch: {
@@ -62,11 +63,13 @@
 		},
 		methods: {
       setAffirm(type){
+        this.$emit('input',this.newValue)
         this.$emit('setAffirm',type)
       },
 			onSelect(index) {
-				this.$emit('onChange', index)
-				this.$emit('input', this.localData[index][this.itemKey])
+        this.current=index
+        this.newValue=this.localData[index][this.itemKey]
+        this.$emit('input',this.newValue)
 			}
 		}
 	}
@@ -75,6 +78,7 @@
 <style lang="scss">
 	.select {
 		height: 800rpx;
+    border-radius: 20rpx 20rpx 0 0;
 	}
 
 	.icon {

+ 1 - 1
page_task/apply/apply.vue

@@ -208,7 +208,7 @@
 			<!-- 抵押信息end -->
 		</view>
     <EnButton  v-if="step === 1"  :text="'下一步'"  @onSubmit="onStep"></EnButton>
-		<EnButton is_both v-else :leftText="'上一步'" :rightText="'提交'" @onLeftSubmit="onLeftSubmit" @onSubmit="onSubmit">
+		<EnButton :is_both="1" v-else :leftText="'上一步'" :rightText="'提交'" @onLeftSubmit="onLeftSubmit" @onSubmit="onSubmit">
 		</EnButton>
 	</view>
 </template>

+ 1 - 1
page_task/information/information.vue

@@ -20,7 +20,7 @@
 				</view>
 			</view>
 		</view>
-		<EnButton is_both :leftText="'保存草稿'" :rightText="'提交资料'" @onLeftSubmit="addDraft" @onSubmit="addTask">
+		<EnButton :is_both="1" :leftText="'保存草稿'" :rightText="'提交资料'" @onLeftSubmit="addDraft" @onSubmit="addTask">
 		</EnButton>
 	</view>
 </template>

+ 5 - 2
page_task/task_details/module/send_chat.vue

@@ -2,7 +2,7 @@
 	<view class="text-color-12">
 		<view class="p-30">
 			<textarea class="sys-from-background-color r-20 textarea p-20" name="" id="" cols="30" rows="10" v-model="msgData.msg" :maxlength="999"
-				placeholder="留个言吧"></textarea>
+				:placeholder="placeholder"></textarea>
 			<view class="size-26 m-t20 sys-weight-600">上传图片</view>
 			<view class="image-content">
 				<view class="image-box"  :key="index" @click="showImg(msgData.msg_img,pIndex)"
@@ -59,7 +59,10 @@
 			is_button: {
 				type: Boolean,
 				default: false
-			}
+			},
+      placeholder:{
+        default: '留个言吧~~'
+      }
 
 		},
 		data() {

+ 9 - 14
page_task/task_details/task_details.vue

@@ -62,23 +62,23 @@
 				</view>
 			</view>
 			<Record v-show="current === 3" ref="recordObj" :business-id="businessId"></Record>
-			<Steps v-show="current === 4" :business-id="businessId"></Steps>
+			<Steps ref="stepsObj"  v-show="current === 4" :business-id="businessId"></Steps>
 		</view>
     <view v-if="isExecute>0 && business.status<4">
-      <EnButton :text="'领取'"  v-if="isExecute===3" @onSubmit="takeTask"></EnButton>
-      <EnButton :text="'完成'"  v-else-if="isExecute===5" @onSubmit="endTask"></EnButton>
-      <EnButton  is_both  :leftText="'作废'" :rightText="'反馈'" centre-text="交接" v-else-if="isExecute===4" @onLeftSubmit="cancellation" @onCentreSubmit="openExecute" @onSubmit="setTaskOperate(1)"></EnButton>
-      <EnButton  is_both  :leftText="'作废'" :rightText="'反馈'"  v-else-if="isExecute===2" @onLeftSubmit="cancellation"  @onSubmit="setTaskOperate(1)"></EnButton>
+      <EnButton v-if="isExecute===3" :text="'领取'"   @onSubmit="takeTask"></EnButton>
+      <EnButton v-else-if="isExecute===2" :is_both="1"  :leftText="'作废'" :rightText="'反馈'"   @onLeftSubmit="cancellation"  @onSubmit="setTaskOperate(3)"></EnButton>
+      <EnButton v-else-if="isExecute===4" :is_both="2"  :leftText="'作废'" :rightText="'反馈'" centre-text="交接"  @onLeftSubmit="cancellation" @onCentreSubmit="openExecute" @onSubmit="setTaskOperate(3)"></EnButton>
+      <EnButton v-else-if="isExecute===5" :text="'完成'"   @onSubmit="endTask"></EnButton>
+      <EnButton v-else-if="isExecute===6" :is_both="1"  :leftText="'拒绝'" :rightText="'同意'"   @onLeftSubmit="auditTask(2)" @onSubmit="auditTask(1)"></EnButton>
       <EnButton   v-else-if="isExecute===7" text="编辑"  @onSubmit="editTask()"></EnButton>
       <EnButton   v-else-if="isExecute===8" text="完善贷后"  @onSubmit="setPostLoan()"></EnButton>
-      <EnButton  is_both  :leftText="'交接'" :rightText="'同意'" centre-text="拒绝" v-else-if="isExecute===6" @onLeftSubmit="openExecute" @onCentreSubmit="auditTask(2)" @onSubmit="auditTask(1)"></EnButton>
-      <EnButton  is_both  :leftText="'作废'" :rightText="'反馈'"  v-else @onLeftSubmit="openExecute"  @onSubmit="setTaskOperate(1)"></EnButton>
+      <EnButton  :is_both="1"  :leftText="'交接'" :rightText="'操作'"  v-else @onLeftSubmit="openExecute"  @onSubmit="setTaskOperate(1)"></EnButton>
 
     </view>
 <!--		<EnButton :text="'冲销'" v-if="current === 1"></EnButton>-->
 <!--		<EnButton is_both :leftText="'交接'" :rightText="'操作'"  @onSubmit="setTaskOperate(1)" @onLeftSubmit="openExecute"></EnButton>-->
 
-    <uni-popup ref="executePopup" type="bottom">
+    <uni-popup   ref="executePopup" type="bottom">
       <EnSelect title="请选择任务接收人"  :local-data="executeData" ref="system" v-model="executeId" @setAffirm="setNewExecute"></EnSelect>
     </uni-popup>
 
@@ -188,6 +188,7 @@
 				this.getTaskDetail()
         uni.$on('newTaskList',()=>{
           this.getTaskDetail()
+          this.$refs.stepsObj.getStageList()
         })
 			} else {
 				tools.leftClick()
@@ -195,9 +196,6 @@
 		},
 		methods: {
       auditTask(auditType) {
-        // this.$refs.popup.open("bottom");
-        // this.auditType = auditType
-        // this.$refs.taskSetObj.startAuditType(auditType);
         uni.navigateTo({
           url: '/page_task/task_operate/task_operate?businessId='+  this.business.id+'&type=2&auditType='+auditType
         });
@@ -208,9 +206,6 @@
         });
       },
       editTask() {
-        // uni.reLaunch({
-        //   url: '/pages/add-client/add-client?businessId=' + this.business.id
-        // })
         uni.reLaunch({
           url: '/pages-task/add-client/new-add?businessId=' + this.business.id
         })

+ 46 - 18
page_task/task_operate/task_operate.vue

@@ -3,7 +3,7 @@
 		<Nav :title="title" :genre="1" :opacity="scrollTop" is_fixed :bgHeight="bgHeight"></Nav>
 		<view class="operate_body page-env-160" :style="{top:`${$tools.topHeight()}px`}">
 			<view class="sys-background-fff m-lr30 m-t30 m-b20 p-lr30 r-20">
-				<view class="" v-if="is_handle">
+				<view class="" v-if="type!=='3'">
 					<view class="row-justify-sb center p-tb30 bor-bottom-1 size-28">
 						<view class="wh-text"><text></text>下一阶段处理</view>
 						<view class="row-c flex"  @click="openPopupObj(1)">
@@ -24,13 +24,13 @@
 						</view>
 						<uni-icons type="forward" size="18" color="#D8D8D8"></uni-icons>
 					</view>
-          <WhInput :name="'回款金额'"  v-if="stageData.operate_ids.indexOf('2')>-1" v-model="businessData.returned_total"  type="digit" placeholder="请输入回款金额" ></WhInput>
-          <WhInput :name="'出款金额'"  v-if="stageData.operate_ids.indexOf('1')>-1" v-model="businessData.out_total"  type="digit" placeholder="请输入出款金额" ></WhInput>
-          <WhInput :name="'银行出款'"  v-if="stageData.operate_ids.indexOf('4')>-1" v-model="businessData.bank_total"  type="digit" placeholder="请输入银行出款" ></WhInput>
+          <en-input :name="'回款金额'"  v-if="stageData.operate_ids.indexOf('2')>-1" v-model="businessData.returned_total"  type="digit" placeholder="请输入回款金额" ></en-input>
+          <en-input :name="'出款金额'"  v-if="stageData.operate_ids.indexOf('1')>-1" v-model="businessData.out_total"  type="digit" placeholder="请输入出款金额" ></en-input>
+          <en-input :name="'银行出款'"  v-if="stageData.operate_ids.indexOf('4')>-1" v-model="businessData.bank_total"  type="digit" placeholder="请输入银行出款" ></en-input>
           <view  v-if="stageData.operate_ids.indexOf('3')>-1">
-            <WhInput :name="'回款姓名'"   v-model="businessData.returned_name"  type="text" placeholder="请输入回款人姓名" ></WhInput>
+            <en-input :name="'回款姓名'"   v-model="businessData.returned_name"  type="text" placeholder="请输入回款人姓名" ></en-input>
 <!--            此处应该是select-->
-            <WhInput :name="'银行出款'"  v-model="businessData.returned_bank_id"  :localData="bankData" placeholder="请选择还款银行" ></WhInput>
+            <en-input :name="'银行出款'"  v-model="businessData.returned_bank_id"  :localData="bankData" placeholder="请选择还款银行" ></en-input>
           </view>
 
 				</view>
@@ -39,7 +39,7 @@
 <!--				</view>-->
 			</view>
 			<view class="sys-background-fff m-lr30 r-20">
-				<SendChat  v-model="msgData"></SendChat>
+				<SendChat  v-model="msgData" :placeholder="type==='2'?'请输入审核意见~~':'请输入描述~~'"></SendChat>
 			</view>
 		</view>
     <view v-show="showExecute">
@@ -58,11 +58,13 @@
   import {
     auditTask, getReturnedBankList,
     getTaskStage,
-    setExecuteTask, setStageOperate
+    setExecuteTask, setMsg, setStageOperate
   } from "@/api/task";
   import {getStageUser} from "@/api/task";
+  import EnInput from "@/components/en-from/en-input/en-input.vue";
 	export default {
 		components: {
+      EnInput,
 			WhInput,
 			SendChat
 		},
@@ -142,8 +144,9 @@
         if(this.type==='1'){
           this.title='任务反馈'
         }else if(this.type==='2'){
-          tools.success('ok')
           this.title='任务审核'
+        }else if(this.type==='3'){
+          this.title='任务执行'
         }else {
           this.title='任务冲销'
         }
@@ -229,9 +232,40 @@
       submit() {
         if (this.type==='2') {
           this.auditTask()
-        } else {
+        } else if (this.type==='1'){
           this.setExecuteTask()
+        }else if (this.type==='3'){
+          this.setMsg()
+        }
+      },
+      setEnd(){
+        uni.$emit('newTaskList')
+        setTimeout(()=>{
+          tools.leftClick()
+        },1000)
+      },
+      setMsg() {
+        if (this.isAjax) {
+          return;
+        }
+        // this.isAjax=true;
+        this.msgData.business_id = this.businessId
+        if (this.replyId) {
+          this.msgData.reply_id = this.replyId;
         }
+        setMsg(this.msgData).then((res) => {
+          if (res.code === 1) {
+            tools.success(res.msg)
+            this.msgData.reply_id = ''
+            this.msgData.msg = ''
+            this.msgData.msg_img = []
+          this.setEnd()
+          } else {
+            tools.error(res.msg)
+            this.isAjax = false;
+          }
+
+        })
       },
       getTaskStage() {
         getTaskStage({
@@ -288,10 +322,7 @@
               auditTask(this.businessData).then((auditRes) => {
                 if (auditRes.code === 1) {
                   tools.success(auditRes.msg)
-                  uni.$emit('newTaskList')
-                  setTimeout(()=>{
-                    tools.leftClick()
-                  },500)
+                  this.setEnd()
                 } else {
                   tools.error(auditRes.msg)
                 }
@@ -305,10 +336,7 @@
           if (auditRes.code === 1) {
             tools.success(auditRes.msg)
             // this.$emit('endTaskSet')
-            uni.$emit('newTaskList')
-            setTimeout(()=>{
-              tools.leftClick()
-            },1000)
+            this.setEnd()
           } else {
             tools.error(auditRes.msg)
           }

+ 3 - 5
pages/index/index.vue

@@ -114,12 +114,10 @@
     },
 		onLoad() {
 			uni.hideTabBar()
-      uni.$on('newReceiving', () => {
-        this.startList()
-      })
-      this.startList()
-
 		},
+    onShow() {
+      this.startList()
+    },
 		onPageScroll(res) {
 			this.scrollTop = res.scrollTop / 120
 		},