Browse Source

修改 bug

master
王泽彦 8 months ago
parent
commit
5c9ac55794
  1. 7
      niucloud/app/service/school_approval/SchoolApprovalProcessService.php
  2. 59
      uniapp/pages-market/clue/edit_clues.vue

7
niucloud/app/service/school_approval/SchoolApprovalProcessService.php

@ -43,7 +43,12 @@ class SchoolApprovalProcessService
->select() ->select()
->toArray(); ->toArray();
$count = (new SchoolApprovalProcess())->where($where)->count(); $count = (new SchoolApprovalProcess())
->alias("a")
->join(['school_personnel' => 'b'], 'a.applicant_id = b.id', 'left')
->join(['school_personnel' => 'c'], 'a.current_approver_id = c.id', 'left')
->where($where)
->count();
return [ return [
'list' => $list, 'list' => $list,

59
uniapp/pages-market/clue/edit_clues.vue

@ -80,7 +80,7 @@
<view class="fui-list__item" style="display: flex;justify-content: flex-end;"> <view class="fui-list__item" style="display: flex;justify-content: flex-end;">
<fui-label> <fui-label>
<view class="fui-align__center"> <view class="fui-align__center">
<fui-radio value="male" checked></fui-radio> <fui-radio value="male"></fui-radio>
<text class="fui-text"></text> <text class="fui-text"></text>
</view> </view>
</fui-label> </fui-label>
@ -101,13 +101,13 @@
<view class="fui-list__item" style="display: flex;justify-content: flex-end;"> <view class="fui-list__item" style="display: flex;justify-content: flex-end;">
<fui-label> <fui-label>
<view class="fui-align__center"> <view class="fui-align__center">
<fui-radio :value="1" checked></fui-radio> <fui-radio value="1"></fui-radio>
<text class="fui-text"></text> <text class="fui-text"></text>
</view> </view>
</fui-label> </fui-label>
<fui-label :margin="['0','0','0','40rpx']"> <fui-label :margin="['0','0','0','40rpx']">
<view class="fui-align__center"> <view class="fui-align__center">
<fui-radio :value="0"></fui-radio> <fui-radio value="0"></fui-radio>
<text class="fui-text"></text> <text class="fui-text"></text>
</view> </view>
</fui-label> </fui-label>
@ -203,13 +203,13 @@
<view class="fui-list__item" style="display: flex;justify-content: flex-end;"> <view class="fui-list__item" style="display: flex;justify-content: flex-end;">
<fui-label> <fui-label>
<view class="fui-align__center"> <view class="fui-align__center">
<fui-radio value="1" checked></fui-radio> <fui-radio value="1" :checked="formData.call_intent === '1'"></fui-radio>
<text class="fui-text"></text> <text class="fui-text"></text>
</view> </view>
</fui-label> </fui-label>
<fui-label :margin="['0','0','0','40rpx']"> <fui-label :margin="['0','0','0','40rpx']">
<view class="fui-align__center"> <view class="fui-align__center">
<fui-radio value="2"></fui-radio> <fui-radio value="2" :checked="formData.call_intent === '2'"></fui-radio>
<text class="fui-text"></text> <text class="fui-text"></text>
</view> </view>
</fui-label> </fui-label>
@ -221,7 +221,7 @@
<!-- 沟通备注 --> <!-- 沟通备注 -->
<fui-form-item label="沟通备注" labelSize='26' prop="communication" background='#434544' labelColor='#fff' :bottomBorder='false'> <fui-form-item label="沟通备注" labelSize='26' prop="communication" background='#434544' labelColor='#fff' :bottomBorder='false'>
<view class="input-title" style="margin-right:14rpx;"> <view class="input-title" style="margin-right:14rpx;">
<fui-textarea v-model="formData.communication" placeholder="点击填写" backgroundColor="#434544" size="26" color="#fff" :borderTop="false" :isCounter="true" :maxlength="500" :minHeight="250" :isAutoHeight="true"></fui-textarea> <fui-textarea v-model="formData.communication" placeholder="点击填写" backgroundColor="#434544" size="26" color="#fff" :borderTop="false" :isCounter="true" :maxlength="500" minHeight="250" :isAutoHeight="true"></fui-textarea>
</view> </view>
</fui-form-item> </fui-form-item>
</view> </view>
@ -350,11 +350,6 @@
<script> <script>
import apiRoute from '@/api/apiRoute.js'; import apiRoute from '@/api/apiRoute.js';
import commonApi from '@/api/common.js';
import marketApi from '@/api/market.js';
import memberApi from '@/api/member.js';
export default { export default {
data() { data() {
return { return {
@ -393,7 +388,7 @@
first_visit_status: '', //访 first_visit_status: '', //访
second_visit_status: '', //访 second_visit_status: '', //访
efficacious:'1', efficacious:'1',
call_intent: '', // call_intent: '2', //
emotional_stickiness_score: '' // emotional_stickiness_score: '' //
}, },
@ -448,20 +443,20 @@
text: '', text: '',
options: [], options: [],
}, },
// // //
call_intent: { // call_intent: {
text: '', // text: '',
options: [ // options: [
{ // {
text:'是', // text:'',
value:'1' // value:'1'
}, // },
{ // {
text:'否', // text:'',
value:'2' // value:'2'
} // }
], // ],
}, // },
// //
status: { status: {
text: '', text: '',
@ -749,8 +744,8 @@
consultation_remark: sixSpeed.consultation_remark || '', // consultation_remark: sixSpeed.consultation_remark || '', //
chasing_orders: sixSpeed.chasing_orders || '', // chasing_orders: sixSpeed.chasing_orders || '', //
is_bm: sixSpeed.is_bm || 2, // is_bm: sixSpeed.is_bm || 2, //
efficacious: sixSpeed.efficacious || '', efficacious: sixSpeed.efficacious+'' || '',
call_intent: sixSpeed.call_intent || '', // call_intent: sixSpeed.call_intent || '2', //
emotional_stickiness_score: sixSpeed.emotional_stickiness_score || '', // emotional_stickiness_score: sixSpeed.emotional_stickiness_score || '', //
}; };
@ -965,19 +960,11 @@
this.openDuplicateCheck() this.openDuplicateCheck()
}, },
// //
changeSex(e) { changeSex(e) {
this.formData.gender = e.detail.value this.formData.gender = e.detail.value
}, },
//tag //tag
async segmented(e) { async segmented(e) {
console.log(e) console.log(e)

Loading…
Cancel
Save