Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/aiot-app

pages/saleManage/contact/contactList.vue

@@ -1,17 +1,17 @@
 <template>
 	<view class="mainBox">
 		<u-list-item v-for="(item, index) in tableList" :key="index" style="position: relative;">
-			<myCard @setFree="setFree(item)" @assignModelShow="assignModelShow(item)" @del="del(item)" :item="item" :index="index+1" :btnList="btnList" :columns="columns"> </myCard>
-	
-			
+			<myCard @setFree="setFree(item)" @addApply="addApply(item)" @assignModelShow="assignModelShow(item)" @del="del(item)" :item="item"
+				:index="index+1" :btnList="btnList" :columns="columns"> </myCard>
+
+
 		</u-list-item>
-		
+
 		<u-modal :show="modalShow" @cancel="modalShow=false" :showCancelButton="true" :closeOnClickOverlay="true"
 			@confirm="assign" :title="'指派'">
 			<view>
 				<view>
-					<u--input placeholder="分管部门" @click.native="showPicker" 
-						v-model="addForm.fgDeptName"></u--input>
+					<u--input placeholder="分管部门" @click.native="showPicker" v-model="addForm.fgDeptName"></u--input>
 
 				</view>
 				<view>
@@ -25,8 +25,8 @@
 
 
 		</u-modal>
-		<ba-tree-picker ref="treePicker" :multiple="false" @select-change="confirm" :localdata="listData"
-			valueKey="id" textKey="name" childrenKey="children" />
+		<ba-tree-picker ref="treePicker" :multiple="false" @select-change="confirm" :localdata="listData" valueKey="id"
+			textKey="name" childrenKey="children" />
 		<u-toast ref="uToast"></u-toast>
 
 	</view>
@@ -37,7 +37,7 @@
 		contactPage,
 		contactDelete,
 		free,
-		assign
+		assign,apply
 	} from '@/api/saleManage/contact/index.js'
 	import {
 		listOrganizations,
@@ -77,7 +77,7 @@
 					[{
 						label: '名称：',
 						prop: 'name',
-						type:'title',
+						type: 'title',
 						className: 'perce100',
 					}],
 					[{
@@ -115,7 +115,7 @@
 					[{
 						label: '操作：',
 						prop: 'action',
-						type:'action',
+						type: 'action',
 						className: 'perce100',
 					}],
 				]
@@ -129,7 +129,7 @@
 			showPicker() {
 				this.$refs.treePicker._show();
 			},
-		
+
 			confirm(data, name) {
 				this.addForm.fgDeptName = name
 				this.addForm.fgDeptId = data[0]
@@ -187,7 +187,7 @@
 				});
 			},
 			assignModelShow(row) {
-				this.current=row
+				this.current = row
 				this.modalShow = true
 			},
 			assign() {
@@ -222,9 +222,21 @@
 						this.getList(this.where)
 					})
 			},
-
-	
-
+			//申请
+			addApply(row) {
+				apply({
+					contactIds: row.id,
+					contactNames:row.name
+				}).then((res) => {
+					this.isEnd = false
+					this.page = 1
+					this.$refs.uToast.show({
+						type: "success",
+						message: "操作成功",
+					})
+					this.getList(this.where)
+				});
+			},
 			//获取列表信息
 			getList(where) {
 				this.where = where

pages/saleManage/contact/index.vue

@@ -30,6 +30,11 @@
 					btnType: 'primary',
 					type: '1',
 					pageUrl: '/pages/saleManage/contact/add'
+				},{
+					name: '申请',
+					apiName: 'addApply',
+					btnType: 'primary',
+					type: '2',
 				}]
 			}
 		},
@@ -50,7 +55,8 @@
 			},
 			scrolltolower() {
 				this.$refs.contactListRef.getList({
-					type: 1
+					type: 1,
+					assignStatus:0
 				})
 			},
 		}