代码上传

src/Form/publicCustomer/add.vue

@@ -108,7 +108,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="法人:" prop="contact">
-                <el-input v-model="form.contact" placeholder="请输入企业税号" style="width: 100%"></el-input>
+                <el-input v-model="form.contact" placeholder="请输入法人信息" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/Form/publicCustomer/edit.vue

@@ -106,7 +106,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="法人:" prop="contact">
-                <el-input v-model="form.contact" placeholder="请输入企业税号" style="width: 100%"></el-input>
+                <el-input v-model="form.contact" placeholder="请输入法人信息" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/Form/salerPrivatecustomer/add.vue

@@ -96,7 +96,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="法人:" prop="contact">
-                <el-input v-model="form.contact" placeholder="请输入企业税号" style="width: 100%"></el-input>
+                <el-input v-model="form.contact" placeholder="请输入法人信息" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/Form/salerPrivatecustomer/edit.vue

@@ -107,7 +107,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="法人:" prop="contact">
-                <el-input v-model="form.contact" placeholder="请输入企业税号" style="width: 100%"></el-input>
+                <el-input v-model="form.contact" placeholder="请输入法人信息" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/HDrpManagement/projectChange/index.vue

@@ -7,7 +7,7 @@
       tableName="projectTable" 
       idName="sa_projectid" 
       :apiId="{query:20221020143502,del:''}"
-      :options="options"
+      :autoQuery="false"
       :detailPath="{path:'/projectChangeDetail',param:{tabIndex:tabIndex}}">
       <template #titleRight>
 <!--        <el-divider direction="vertical"></el-divider>
@@ -22,7 +22,7 @@
       </template>
       <template #custom >
         <div class="mt-10">
-          <label  class="search__label" >数据分类:</label>
+          <label  class="search__label" >范围:</label>
           <el-select class="inline-24" v-model="tabName" placeholder="请选择数据分类" @change="selectChange" size="small" >
             <el-option
                 v-for="item in editableTabs"

src/HManagement/task/modules/add.vue

@@ -3,14 +3,14 @@
     <el-button size="small" type="primary" @click="dialogTableVisible = true">
         创建任务
     </el-button>
-    <el-dialog title="创建任务" append-to-body :visible.sync="dialogTableVisible" width="700px">
+    <el-dialog title="创建任务" append-to-body :visible.sync="dialogTableVisible" width="700px" @close="leaderShow = false;assistShow = false">
 			<el-alert
 				v-if="errormsg"
 				class="normal-margin"
 				:title="errormsg"
 				type="error">
 			</el-alert>
-			<el-input class="normal-margin" v-model="form.title" placeholder="输入任务标题" type="text" show-word-limit maxlength="40" size="small"></el-input>
+			<el-input class="normal-margin" v-model="form.title" placeholder="输入任务标题" type="text" show-word-limit maxlength="40" size="small" ></el-input>
 			<el-input  class="normal-margin" v-model="form.remarks" placeholder="输入任务内容" :autosize="{minRows:6}" type="textarea" show-word-limit maxlength="100" size="small"></el-input>
 			<div class="flex-align-center flex-between normal-margin">
 				<p class="task__label"><i class="el-icon-time"></i>&emsp;开始：</p>
@@ -32,7 +32,7 @@
 				</el-date-picker>
 			</div>
 			<div class="normal-margin flex-align-center">
-				<p class="task__label"><i class="el-icon-bell"></i>&emsp;提醒时间&emsp;</p>
+				<p class="task__label"><i class="el-icon-bell"></i>&emsp;提醒时间：结束前&nbsp;</p>
 				<el-input :disabled="!form.endtime" v-model="form.remindday" size="small" style="width:90px"></el-input>
 				<p>&emsp;天</p>
 			</div>
@@ -56,24 +56,35 @@
 				</el-input>
 			</div> -->
 			<div>
-				<p class="mt-10 task__label">执行人员</p>
+<!--				<p class="mt-10 task__label">执行人员</p>-->
 				<div class="flex-align-center flex-between">
 					<el-popover
 						placement="right"
 						trigger="manual"
 						width="400"
-						v-model="visible">
-						<member ref="member" :param="param" :radio="true" @onSelect="setLeader" @onCancel="visible1 = false"></member>
+						v-model="leaderShow">
+						<member ref="member" :param="param" :radio="true" @onSelect="setLeader" @onCancel="leaderShow = false"></member>
 						<el-input placeholder="请输入内容" readonly v-model="leader.name" class="input-with-select" size="small" slot="reference" @focus="showMenber">
-							<p slot="prepend">主 办</p>
+							<p slot="prepend">执行人</p>
 						</el-input>
 					</el-popover>
+          <el-popover
+              placement="right"
+              trigger="manual"
+              width="400"
+              v-model="assistShow">
+            <member ref="member" :param="param" :radio="false" @onSelect="setAssist" @onCancel="assistShow = false"></member>
+            <el-input placeholder="请输入内容" readonly v-model="assistPerson" class="input-with-select" size="small" slot="reference" @focus="showMenberAssist">
+              <p slot="prepend">协助人</p>
+            </el-input>
+          </el-popover>
 					
 					<!-- &emsp;
 					<el-input placeholder="请输入内容" v-model="input3" class="input-with-select" size="small">
 						<p slot="prepend">协 办</p>
 					</el-input> -->
 				</div>
+
 			</div>
 			<div slot="footer" class="dialog-footer">
         <el-button size="small" style="width:120px" @click="dialogTableVisible = false">取 消</el-button>
@@ -94,7 +105,8 @@ export default {
 	},
 	data () {
 		return {
-			visible:false,
+      leaderShow:false,
+      assistShow:false,
 			dialogTableVisible:false,
 			folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
 			form:{
@@ -125,7 +137,9 @@ export default {
 
 			errormsg:'',
 			bindData:{},
-			leader:{}
+			leader:{},
+      assist:[],
+      assistPerson:''
 		}
 	},
 	methods:{
@@ -143,8 +157,22 @@ export default {
 		setLeader (val) {
 			this.leader = val[0]
 			this.form.leaderuserid = val[0].userid
-			this.visible = false
+			this.leaderShow = false
 		},
+    setAssist (val) {
+      console.log(val)
+      this.assistPerson = ''
+      this.assist = []
+      val.forEach((item,index)=>{
+        if (index === 0){
+          this.assistPerson = item.name
+        }else {
+          this.assistPerson = this.assistPerson + ',' + item.name
+        }
+        this.assist[index] = item.userid
+      })
+      this.assistShow = false
+    },
 		async submit () {
 			const res = await this.$api.requested({
         "id": 20221211112101,
@@ -162,6 +190,7 @@ export default {
 				this.dialogTableVisible = false
 				this.refresh()
 				this.errormsg = ''
+        this.insertAssist(res.data.sys_taskid)
       })
 		},
 		refresh () {
@@ -177,9 +206,26 @@ export default {
 			}
 		},
 		showMenber () {
-			this.visible = true
+			this.leaderShow = true
+      this.assistShow = false
 			// this.validateInput()
-		}
+		},
+    showMenberAssist () {
+      this.assistShow = true
+      this.leaderShow = false
+      // this.validateInput()
+    },
+    async insertAssist(id){
+      const res = await this.$api.requested({
+        "id": 20220930103601,
+        "content": {
+          "ownertable":"sys_task",
+          "ownerid":id,
+          "userids":this.assist,
+          "justuserids":true
+        }
+      })
+    }
 	}
 }
 

src/HManagement/task/modules/addCopy.vue

@@ -0,0 +1,191 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" @click="dialogTableVisible = true">
+        创建任务
+    </el-button>
+    <el-dialog title="创建任务" append-to-body :visible.sync="dialogTableVisible" width="700px">
+			<el-alert
+				v-if="errormsg"
+				class="normal-margin"
+				:title="errormsg"
+				type="error">
+			</el-alert>
+			<el-input class="normal-margin" v-model="form.title" placeholder="输入任务标题" type="text" show-word-limit maxlength="40" size="small"></el-input>
+			<el-input  class="normal-margin" v-model="form.remarks" placeholder="输入任务内容" :autosize="{minRows:6}" type="textarea" show-word-limit maxlength="100" size="small"></el-input>
+			<div class="flex-align-center flex-between normal-margin">
+				<p class="task__label"><i class="el-icon-time"></i>&emsp;开始：</p>
+				<el-date-picker
+					v-model="form.starttime"
+					type="date"
+					placeholder="选择日期"
+					value-format="yyyy-MM-dd"
+					size="small">
+				</el-date-picker>
+				&emsp;- &emsp;
+				<p class="task__label">结束：</p>
+				<el-date-picker
+					v-model="form.endtime"
+					type="date"
+					placeholder="选择日期"
+					value-format="yyyy-MM-dd"
+					size="small">
+				</el-date-picker>
+			</div>
+			<div class="normal-margin flex-align-center">
+				<p class="task__label"><i class="el-icon-bell"></i>&emsp;提醒时间&emsp;</p>
+				<el-input :disabled="!form.endtime" v-model="form.remindday" size="small" style="width:90px"></el-input>
+				<p>&emsp;天</p>
+			</div>
+			<div class="normal-margin">
+				<p class="task__label"><i class="el-icon-upload2"></i>&emsp;上传附件</p>
+				<upload
+					ref="upload"
+					:folderid="folderid"
+					:bindData="bindData"
+					type="button">
+				</upload>
+			</div>
+			<!-- <div class="normal-margin">
+				<p class="mt-10 task__label">关联项目/客户</p>
+				<el-input placeholder="请输入内容" disabled v-model="input3" class="input-with-select" size="small">
+					<el-select v-model="form.nat" slot="prepend" style="width:100px" placeholder="请选择">
+						<el-option label="不关联" value="1"></el-option>
+						<el-option label="项目" value="2"></el-option>
+						<el-option label="客户" value="3"></el-option>
+					</el-select>
+				</el-input>
+			</div> -->
+			<div>
+				<p class="mt-10 task__label">执行人员</p>
+				<div class="flex-align-center flex-between">
+					<el-popover
+						placement="right"
+						trigger="manual"
+						width="400"
+						v-model="visible">
+						<member ref="member" :param="param" :radio="true" @onSelect="setLeader" @onCancel="visible1 = false"></member>
+						<el-input placeholder="请输入内容" readonly v-model="leader.name" class="input-with-select" size="small" slot="reference" @focus="showMenber">
+							<p slot="prepend">主 办</p>
+						</el-input>
+					</el-popover>
+					
+					<!-- &emsp;
+					<el-input placeholder="请输入内容" v-model="input3" class="input-with-select" size="small">
+						<p slot="prepend">协 办</p>
+					</el-input> -->
+				</div>
+			</div>
+			<div slot="footer" class="dialog-footer">
+        <el-button size="small" style="width:120px" @click="dialogTableVisible = false">取 消</el-button>
+        <el-button type="warning" size="small" style="width:120px" @click="validateInput">创 建</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import member from '@/template/menber/index.vue'
+
+import upload from '@/components/upload/preview_upload.vue';
+export default {
+	props:['ownertable'],
+	components:{
+		upload,
+		member
+	},
+	data () {
+		return {
+			visible:false,
+			dialogTableVisible:false,
+			folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
+			form:{
+				"sys_taskid":0,
+        "title":"",
+        "remarks":"",
+        "starttime":"",
+        "remindday":0,
+        "ownertable":"",
+        "ownerid":0,
+        "endtime":"",
+				"leaderuserid":""
+			},
+			// 查询可选择人员参数
+			param:{
+        id:'20221018122201',
+        content: {
+          "ownertable":'sys_task',
+          "ownerid":0,
+          "pageSize":20,
+          "where":{
+            "condition":"",
+            "withoutselect":0,
+            
+          }
+        }
+      },
+
+			errormsg:'',
+			bindData:{},
+			leader:{}
+		}
+	},
+	methods:{
+		validateInput () {
+			if (!this.form.title) {
+				this.errormsg = '请输入标题'
+				return false
+			} else if (!this.form.starttime) {
+				this.errormsg = '请选择开始日期'
+				return false
+			} else {
+				this.submit()
+			}
+		},
+		setLeader (val) {
+			this.leader = val[0]
+			this.form.leaderuserid = val[0].userid
+			this.visible = false
+		},
+		async submit () {
+			const res = await this.$api.requested({
+        "id": 20221211112101,
+        "content":this.form
+      })
+      this.tool.showMessage(res,()=>{
+				this.param.content.ownerid = res.data.sys_taskid
+        this.bindData = {
+          "ownertable": 'sys_task',
+          "ownerid": res.data.sys_taskid,
+          "usetype": 'default',
+        }
+        this.$refs['upload'].toUpload()
+        this.$emit('onSuccess')
+				this.dialogTableVisible = false
+				this.refresh()
+				this.errormsg = ''
+      })
+		},
+		refresh () {
+			this.form = {
+				"sys_taskid":0,
+        "title":"任务标题",
+        "remarks":"任务说明",
+        "starttime":"",
+        "remindday":0,
+        "ownertable":"",
+        "ownerid":0,
+        "endtime":""
+			}
+		},
+		showMenber () {
+			this.visible = true
+			// this.validateInput()
+		}
+	}
+}
+
+</script>
+<style scoped>
+.task__label{
+	color:rgb(173, 172, 172);
+}
+</style>

src/HManagement/task/modules/detail.vue

@@ -57,6 +57,8 @@ export default {
       })
       this.mainData = res.data
       this.changeDataStructure()
+      this.$refs['details'].$refs['group'].queryGroup()
+
     },
     changeDataStructure() {
       let that = this

src/HManagement/task/modules/edit.vue

@@ -3,7 +3,7 @@
     <el-button v-show="nowUserid === data.createuserid" size="mini" type="primary" @click="onShow(dialogTableVisible = true)">
         编 辑
     </el-button>
-    <el-dialog title="编辑任务" append-to-body :visible.sync="dialogTableVisible" width="700px">
+    <el-dialog title="编辑任务" append-to-body :visible.sync="dialogTableVisible" width="700px" @close="leaderShow = false;assistShow = false">
 			<el-alert
 				v-if="errormsg"
 				class="normal-margin"
@@ -62,12 +62,22 @@
 						placement="right"
 						trigger="manual"
 						width="400"
-						v-model="visible">
-						<member ref="member" :param="param" :radio="true" @onSelect="setLeader" @onCancel="visible1 = false"></member>
+						v-model="leaderShow">
+						<member ref="member" :param="param" :radio="true" @onSelect="setLeader" @onCancel="leaderShow = false"></member>
 						<el-input placeholder="请输入内容" readonly v-model="leader.name" class="input-with-select" size="small" slot="reference" @focus="showMenber">
-							<p slot="prepend">主 办</p>
+							<p slot="prepend">执行人</p>
 						</el-input>
 					</el-popover>
+          <el-popover
+              placement="right"
+              trigger="manual"
+              width="400"
+              v-model="assistShow">
+            <member ref="member" :param="param" :radio="false" @onSelect="setAssist" @onCancel="assistShow = false"></member>
+            <el-input placeholder="请输入内容" readonly v-model="assistPerson" class="input-with-select" size="small" slot="reference" @focus="showMenberAssist">
+              <p slot="prepend">协助人</p>
+            </el-input>
+          </el-popover>
 					
 					<!-- &emsp;
 					<el-input placeholder="请输入内容" v-model="input3" class="input-with-select" size="small">
@@ -94,7 +104,8 @@ export default {
 	},
 	data () {
 		return {
-			visible:false,
+      leaderShow:false,
+      assistShow:false,
 			dialogTableVisible:false,
 			folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
 			nowUserid: JSON.parse(sessionStorage.getItem('active_account')).userid,
@@ -126,13 +137,16 @@ export default {
 
 			errormsg:'',
 			bindData:{},
-			leader:{}
+			leader:{},
+      assistPerson:'',
+      assist:[],
 		}
 	},
 	methods:{
 		onShow () {
 			this.form = Object.assign({},this.form,this.data)
 			this.leader = this.data.leader[0]?this.data.leader[0]:''
+      this.assistList(this.data.sys_taskid)
 		},
 		validateInput () {
 			if (!this.form.title) {
@@ -148,8 +162,22 @@ export default {
 		setLeader (val) {
 			this.leader = val[0]
 			this.form.leaderuserid = val[0].userid
-			this.visible = false
+			this.leaderShow = false
 		},
+    setAssist (val) {
+      console.log(val)
+      this.assistPerson = ''
+      this.assist = []
+      val.forEach((item,index)=>{
+        if (index === 0){
+          this.assistPerson = item.name
+        }else {
+          this.assistPerson = this.assistPerson + ',' + item.name
+        }
+        this.assist[index] = item.userid
+      })
+      this.assistShow = false
+    },
 		async submit () {
 			const res = await this.$api.requested({
         "id": 20221211112101,
@@ -157,10 +185,10 @@ export default {
       })
       this.tool.showMessage(res,()=>{
 				this.param.content.ownerid = res.data.sys_taskid
-        this.$emit('onSuccess')
 				this.dialogTableVisible = false
 				this.refresh()
 				this.errormsg = ''
+        this.insertAssist(res.data.sys_taskid)
       })
 		},
 		refresh () {
@@ -176,9 +204,50 @@ export default {
 			}
 		},
 		showMenber () {
-			this.visible = true
+			this.leaderShow = true
+      this.assistShow = false
 			// this.validateInput()
-		}
+		},
+    showMenberAssist () {
+      this.assistShow = true
+      this.leaderShow = false
+      // this.validateInput()
+    },
+    async assistList(id){
+      const res = await this.$api.requested({
+        "id": 20220930103501,
+        "content": {
+          "ownertable":"sys_task",
+          "ownerid":id
+        }
+      })
+      console.log(res,"团队")
+      let arr = []
+      res.data[0].team.forEach((e,index)=>{
+        if (e.isleader === 0){
+          arr[index] = e
+          if (index === 1){
+            this.assistPerson = e.name
+          }else {
+            this.assistPerson = this.assistPerson + ',' + e.name
+          }
+        }
+      })
+      console.log(arr)
+      console.log(this.assistPerson)
+    },
+    async insertAssist(id){
+      const res = await this.$api.requested({
+        "id": 20220930103601,
+        "content": {
+          "ownertable":"sys_task",
+          "ownerid":id,
+          "userids":this.assist,
+          "justuserids":true
+        }
+      })
+      this.$emit('onSuccess')
+    }
 	}
 }
 

src/HManagement/task/modules/editCopy.vue

@@ -0,0 +1,190 @@
+<template>
+  <div>
+    <el-button v-show="nowUserid === data.createuserid" size="mini" type="primary" @click="onShow(dialogTableVisible = true)">
+        编 辑
+    </el-button>
+    <el-dialog title="编辑任务" append-to-body :visible.sync="dialogTableVisible" width="700px">
+			<el-alert
+				v-if="errormsg"
+				class="normal-margin"
+				:title="errormsg"
+				type="error">
+			</el-alert>
+			<el-input class="normal-margin" v-model="form.title" placeholder="输入任务标题" type="text" show-word-limit maxlength="40" size="small"></el-input>
+			<el-input  class="normal-margin" v-model="form.remarks" placeholder="输入任务内容" :autosize="{minRows:6}" type="textarea" show-word-limit maxlength="100" size="small"></el-input>
+			<div class="flex-align-center flex-between normal-margin">
+				<p class="task__label"><i class="el-icon-time"></i>&emsp;开始：</p>
+				<el-date-picker
+					v-model="form.starttime"
+					type="date"
+					placeholder="选择日期"
+					value-format="yyyy-MM-dd"
+					size="small">
+				</el-date-picker>
+				&emsp;- &emsp;
+				<p class="task__label">结束：</p>
+				<el-date-picker
+					v-model="form.endtime"
+					type="date"
+					placeholder="选择日期"
+					value-format="yyyy-MM-dd"
+					size="small">
+				</el-date-picker>
+			</div>
+			<div class="normal-margin flex-align-center">
+				<p class="task__label"><i class="el-icon-bell"></i>&emsp;提醒时间&emsp;</p>
+				<el-input :disabled="!form.endtime" v-model="form.remindday" size="small" style="width:90px"></el-input>
+				<p>&emsp;天</p>
+			</div>
+			<!-- <div class="normal-margin">
+				<p class="task__label"><i class="el-icon-upload2"></i>&emsp;上传附件</p>
+				<upload
+					ref="upload"
+					:folderid="folderid"
+					:bindData="bindData"
+					type="button">
+				</upload>
+			</div> -->
+			<!-- <div class="normal-margin">
+				<p class="mt-10 task__label">关联项目/客户</p>
+				<el-input placeholder="请输入内容" disabled v-model="input3" class="input-with-select" size="small">
+					<el-select v-model="form.nat" slot="prepend" style="width:100px" placeholder="请选择">
+						<el-option label="不关联" value="1"></el-option>
+						<el-option label="项目" value="2"></el-option>
+						<el-option label="客户" value="3"></el-option>
+					</el-select>
+				</el-input>
+			</div> -->
+			<div>
+				<p class="mt-10 task__label">执行人员</p>
+				<div class="flex-align-center flex-between">
+					<el-popover
+						placement="right"
+						trigger="manual"
+						width="400"
+						v-model="visible">
+						<member ref="member" :param="param" :radio="true" @onSelect="setLeader" @onCancel="visible1 = false"></member>
+						<el-input placeholder="请输入内容" readonly v-model="leader.name" class="input-with-select" size="small" slot="reference" @focus="showMenber">
+							<p slot="prepend">主 办</p>
+						</el-input>
+					</el-popover>
+					
+					<!-- &emsp;
+					<el-input placeholder="请输入内容" v-model="input3" class="input-with-select" size="small">
+						<p slot="prepend">协 办</p>
+					</el-input> -->
+				</div>
+			</div>
+			<div slot="footer" class="dialog-footer">
+        <el-button size="small" style="width:120px" @click="dialogTableVisible = false">取 消</el-button>
+        <el-button type="warning" size="small" style="width:120px" @click="validateInput">保 存</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import member from '@/template/menber/index.vue'
+
+import upload from '@/components/upload/preview_upload.vue';
+export default {
+	props:['data'],
+	components:{
+		upload,
+		member
+	},
+	data () {
+		return {
+			visible:false,
+			dialogTableVisible:false,
+			folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
+			nowUserid: JSON.parse(sessionStorage.getItem('active_account')).userid,
+			form:{
+				"sys_taskid":0,
+        "title":"",
+        "remarks":"",
+        "starttime":"",
+        "remindday":0,
+        "ownertable":"",
+        "ownerid":0,
+        "endtime":"",
+				"leaderuserid":""
+			},
+			// 查询可选择人员参数
+			param:{
+        id:'20221018122201',
+        content: {
+          "ownertable":'sys_task',
+          "ownerid":0,
+          "pageSize":20,
+          "where":{
+            "condition":"",
+            "withoutselect":0,
+            
+          }
+        }
+      },
+
+			errormsg:'',
+			bindData:{},
+			leader:{}
+		}
+	},
+	methods:{
+		onShow () {
+			this.form = Object.assign({},this.form,this.data)
+			this.leader = this.data.leader[0]?this.data.leader[0]:''
+		},
+		validateInput () {
+			if (!this.form.title) {
+				this.errormsg = '请输入标题'
+				return false
+			} else if (!this.form.starttime) {
+				this.errormsg = '请选择开始日期'
+				return false
+			} else {
+				this.submit()
+			}
+		},
+		setLeader (val) {
+			this.leader = val[0]
+			this.form.leaderuserid = val[0].userid
+			this.visible = false
+		},
+		async submit () {
+			const res = await this.$api.requested({
+        "id": 20221211112101,
+        "content":this.form
+      })
+      this.tool.showMessage(res,()=>{
+				this.param.content.ownerid = res.data.sys_taskid
+        this.$emit('onSuccess')
+				this.dialogTableVisible = false
+				this.refresh()
+				this.errormsg = ''
+      })
+		},
+		refresh () {
+			this.form = {
+				"sys_taskid":0,
+        "title":"任务标题",
+        "remarks":"任务说明",
+        "starttime":"",
+        "remindday":0,
+        "ownertable":"",
+        "ownerid":0,
+        "endtime":""
+			}
+		},
+		showMenber () {
+			this.visible = true
+			// this.validateInput()
+		}
+	}
+}
+
+</script>
+<style scoped>
+.task__label{
+	color:rgb(173, 172, 172);
+}
+</style>

src/SDrpManagement/salerPrivatecustomer/detail/modules/addressManage/modules/add.vue

@@ -65,7 +65,7 @@
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width" :disabled="form.province === '' && form.address === ''">确 定</el-button>
       </div>
     </el-drawer>
   </div>
@@ -102,7 +102,7 @@ export default {
           { required: false, message: '地址不能为空', trigger: 'blur' },
         ],
       },
-      value:'',
+      value:[],
       addressList:[],
       typeData:[]
     }
@@ -194,10 +194,13 @@ export default {
     },
     /*省市县*/
     cascaderChange (val) {
+      console.log(this.form.province)
       if (val.length === 1)
         return this.form = Object.assign({},this.form,{province:val[0],city:'',county:''})
 
       this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
+      console.log(this.form)
+      console.log(this.form.province)
 
     },
     /*地址类型*/

src/SDrpManagement/salerPrivatecustomer/detail/modules/financialInfo/index.vue

@@ -29,7 +29,7 @@
       </el-table-column>
       <el-table-column
         prop="taxno"
-        label="纳税识别号">
+        label="税号">
       </el-table-column>
       <el-table-column
         prop="bank"

src/SDrpManagement/salerPrivatecustomer/detail/modules/financialInfo/modules/add.vue

@@ -13,7 +13,7 @@
           <el-form-item label="开票抬头" prop="enterprisename">
             <el-input v-model="form.enterprisename" placeholder="抬头"></el-input>
           </el-form-item>
-          <el-form-item label="纳税识别号" prop="taxno">
+          <el-form-item label="税号" prop="taxno">
             <el-input v-model="form.taxno" placeholder="统一社会信用代码"></el-input>
           </el-form-item>
           <el-form-item label="开户银行" >

src/SDrpManagement/salerPrivatecustomer/detail/modules/financialInfo/modules/edit.vue

@@ -13,7 +13,7 @@
           <el-form-item label="开票抬头" prop="enterprisename">
             <el-input v-model="form.enterprisename" placeholder="抬头"></el-input>
           </el-form-item>
-          <el-form-item label="纳税识别号" prop="taxno">
+          <el-form-item label="税号" prop="taxno">
             <el-input v-model="form.taxno" placeholder="统一社会信用代码"></el-input>
           </el-form-item>
           <el-form-item label="开户银行" >

src/SDrpManagement/salerPrivatecustomer/detail/modules/operation/recovery.vue

@@ -69,7 +69,7 @@ export default {
           "id": 20221014165602,
           "content": {
             "sa_customerpoolid":this.form.sa_customerpoolid,//公海池id
-            "sa_customersids":[this.data.sa_customersid]//客户id
+            "sa_customersid":this.data.sa_customersid//客户id
           },
         })
         this.tool.showMessage(res, ()=>{

src/SDrpManagement/salerPrivatecustomer/detail/modules/operation/toBack.vue

@@ -28,7 +28,7 @@ export default {
         "id": 20221014102602,
         "content": {
           "sa_customerpoolid":this.data.sa_customerpoolid_source,//公海池id
-          "sa_customersids":[this.data.sa_customersid]//客户id
+          "sa_customersid":this.data.sa_customersid//客户id
         },
       })
       this.tool.showMessage(res,()=>{

src/SManagement/orderclue_detail/components/changeCustomer.vue

@@ -51,6 +51,21 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="企业简称:" prop="abbreviation">
+                <el-input v-model="form.abbreviation" placeholder="请输入企业简称" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="企业税号:" prop="taxno">
+                <el-input v-model="form.taxno" placeholder="请输入企业税号" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="法人:" prop="contact">
+                <el-input v-model="form.contact" placeholder="请输入法人信息" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="所属行业:" >
                 <el-select v-model="form.industry" placeholder="请选择所属行业" style="width: 100%">
@@ -63,6 +78,21 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="省市县:" >
+                <el-cascader
+                    style="width: 100%"
+                    v-model="value"
+                    :options="basicData.data().areaData"
+                    @change="cascaderChange" clearable>
+                </el-cascader>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="企业地址:" prop="address">
+                <el-input v-model="form.address" placeholder="请输入企业地址" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="上级客户:" >
                 <el-popover
@@ -120,37 +150,6 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
-              <el-form-item label="省市县:" >
-                <el-cascader
-                    style="width: 100%"
-                    v-model="value"
-                    :options="basicData.data().areaData"
-                    @change="cascaderChange" clearable>
-                </el-cascader>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="企业地址:" prop="address">
-                <el-input v-model="form.address" placeholder="请输入企业地址" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="企业简称:" prop="abbreviation">
-                <el-input v-model="form.abbreviation" placeholder="请输入企业简称" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="企业税号:" prop="taxno">
-                <el-input v-model="form.taxno" placeholder="请输入企业税号" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="24">
-              <el-form-item label="联系方式:" prop="phonenumber">
-                <el-input v-model="form.phonenumber" placeholder="请输入联系方式" style="width: 100%"></el-input>
-              </el-form-item>
-            </el-col>
           </el-form>
         </el-row>
       </div>
@@ -390,6 +389,7 @@ export default {
       this.form.province = val.regProvince
       this.form.city = val.regCity
       this.form.county = val.regArea
+      this.form.contact = val.legalPerson
     },
     /*省市县*/
     cascaderChange (val) {

src/SManagement/orderclue_detail/index.vue

@@ -279,6 +279,7 @@ export default {
           {label:'最近编辑人',value:this.mainData.editBy},
           {label:'最近编辑时间',value:this.mainData.editDate},
           {label:'转化次数',value:this.mainData.isproject === 0 && this.mainData.iscustomer === 0?'0':this.mainData.isproject + this.mainData.iscustomer },
+          {label:'转手次数', value:this.mainData.leader[0].leadernum === 0?'0':this.mainData.leader[0].leadernum},
         ]
       }
     },