Ver Fonte

任务调整,展示优化

qymljy há 1 ano atrás
pai
commit
7655f34302

+ 14 - 11
src/Form/EnterpriseArchives/add.vue

@@ -16,16 +16,19 @@
                   width="900"
                   v-model="businessShow"
                   trigger="manual">
-                <el-input
-                    style="width:300px;margin-bottom: 10px"
-                    placeholder="请输入内容"
-                    v-model="form.enterprisename"
-                    clearable
-                    @clear="businessSearch"
-                    size="mini"
-                    @keyup.enter.native="businessSearch">
-                  <i slot="prefix" class="el-icon-search" @click="businessSearch"></i>
-                </el-input>
+                <div style="margin-bottom: 10px;display: flex;justify-content: space-between">
+                  <el-input
+                      style="width:300px;"
+                      placeholder="请输入内容"
+                      v-model="form.enterprisename"
+                      clearable
+                      @clear="businessSearch"
+                      size="mini"
+                      @keyup.enter.native="businessSearch">
+                    <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
+                  </el-input>
+                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">
                     <template slot-scope="scope">
@@ -293,4 +296,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

+ 15 - 12
src/Form/EnterpriseArchives/edit.vue

@@ -16,16 +16,19 @@
                   width="900"
                   v-model="businessShow"
                   trigger="manual">
-                <el-input
-                    style="width:300px;margin-bottom: 10px"
-                    placeholder="请输入内容"
-                    v-model="form.enterprisename"
-                    clearable
-                    @clear="businessSearch"
-                    size="mini"
-                    @keyup.enter.native="businessSearch">
-                  <i slot="prefix" class="el-icon-search" @click="businessSearch"></i>
-                </el-input>
+                <div style="margin-bottom: 10px;display: flex;justify-content: space-between">
+                  <el-input
+                      style="width:300px;"
+                      placeholder="请输入内容"
+                      v-model="form.enterprisename"
+                      clearable
+                      @clear="businessSearch"
+                      size="mini"
+                      @keyup.enter.native="businessSearch">
+                    <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
+                  </el-input>
+                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">
                     <template slot-scope="scope">
@@ -236,7 +239,7 @@ export default {
     },
     cascaderChange (val) {
       this.form.province = val
-      
+
     },
     onSubmit () {
       this.$refs['form'].validate(async (valid) => {
@@ -309,4 +312,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

+ 13 - 10
src/Form/competitor/add.vue

@@ -28,16 +28,19 @@
                   width="900"
                   v-model="businessShow"
                   trigger="manual">
-                <el-input
-                    style="width:300px;margin-bottom: 10px"
-                    placeholder="请输入内容"
-                    v-model="form.enterprisename"
-                    clearable
-                    @clear="businessSearch"
-                    size="mini"
-                    @keyup.enter.native="businessSearch">
-                  <i slot="prefix" class="el-icon-search" @click="businessSearch"></i>
-                </el-input>
+                <div style="margin-bottom: 10px;display: flex;justify-content: space-between">
+                  <el-input
+                      style="width:300px;"
+                      placeholder="请输入内容"
+                      v-model="form.enterprisename"
+                      clearable
+                      @clear="businessSearch"
+                      size="mini"
+                      @keyup.enter.native="businessSearch">
+                    <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
+                  </el-input>
+                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">
                     <template slot-scope="scope">

+ 13 - 10
src/Form/competitor/edit.vue

@@ -28,16 +28,19 @@
                   width="900"
                   v-model="businessShow"
                   trigger="manual">
-                <el-input
-                    style="width:300px;margin-bottom: 10px"
-                    placeholder="请输入内容"
-                    v-model="form.enterprisename"
-                    clearable
-                    @clear="businessSearch"
-                    size="mini"
-                    @keyup.enter.native="businessSearch">
-                  <i slot="prefix" class="el-icon-search" @click="businessSearch"></i>
-                </el-input>
+                <div style="margin-bottom: 10px;display: flex;justify-content: space-between">
+                  <el-input
+                      style="width:300px;"
+                      placeholder="请输入内容"
+                      v-model="form.enterprisename"
+                      clearable
+                      @clear="businessSearch"
+                      size="mini"
+                      @keyup.enter.native="businessSearch">
+                    <i slot="prefix" class="el-icon-search" @click="businessSearch"></i>
+                  </el-input>
+                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">
                     <template slot-scope="scope">

+ 13 - 10
src/Form/publicCustomer/add.vue

@@ -24,16 +24,19 @@
                   width="900"
                   v-model="businessShow"
                   trigger="manual">
-                <el-input
-                    style="width:300px;margin-bottom: 10px"
-                    placeholder="请输入内容"
-                    v-model="form.enterprisename"
-                    clearable
-                    @clear="businessSearch"
-                    size="mini"
-                    @keyup.enter.native="businessSearch">
-                  <i slot="prefix" class="el-icon-search" @click="businessSearch"></i>
-                </el-input>
+                <div style="margin-bottom: 10px;display: flex;justify-content: space-between">
+                  <el-input
+                      style="width:300px;"
+                      placeholder="请输入内容"
+                      v-model="form.enterprisename"
+                      clearable
+                      @clear="businessSearch"
+                      size="mini"
+                      @keyup.enter.native="businessSearch">
+                    <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
+                  </el-input>
+                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">
                     <template slot-scope="scope">

+ 13 - 10
src/Form/publicCustomer/addCopy.vue

@@ -24,16 +24,19 @@
                   width="900"
                   v-model="businessShow"
                   trigger="manual">
-                <el-input
-                    style="width:300px;margin-bottom: 10px"
-                    placeholder="请输入内容"
-                    v-model="form.enterprisename"
-                    clearable
-                    @clear="businessSearch"
-                    size="mini"
-                    @keyup.enter.native="businessSearch">
-                  <i slot="prefix" class="el-icon-search" @click="businessSearch"></i>
-                </el-input>
+                <div style="margin-bottom: 10px;display: flex;justify-content: space-between">
+                  <el-input
+                      style="width:300px;"
+                      placeholder="请输入内容"
+                      v-model="form.enterprisename"
+                      clearable
+                      @clear="businessSearch"
+                      size="mini"
+                      @keyup.enter.native="businessSearch">
+                    <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
+                  </el-input>
+                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">
                     <template slot-scope="scope">

+ 13 - 10
src/Form/publicCustomer/edit.vue

@@ -24,16 +24,19 @@
                   width="900"
                   v-model="businessShow"
                   trigger="manual">
-                <el-input
-                    style="width:300px;margin-bottom: 10px"
-                    placeholder="请输入内容"
-                    v-model="form.enterprisename"
-                    clearable
-                    @clear="businessSearch"
-                    size="mini"
-                    @keyup.enter.native="businessSearch">
-                  <i slot="prefix" class="el-icon-search" @click="businessSearch"></i>
-                </el-input>
+                <div style="margin-bottom: 10px;display: flex;justify-content: space-between">
+                  <el-input
+                      style="width:300px;"
+                      placeholder="请输入内容"
+                      v-model="form.enterprisename"
+                      clearable
+                      @clear="businessSearch"
+                      size="mini"
+                      @keyup.enter.native="businessSearch">
+                    <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
+                  </el-input>
+                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">
                     <template slot-scope="scope">

+ 13 - 10
src/Form/salerPrivatecustomer/add.vue

@@ -23,16 +23,19 @@
                   width="900"
                   v-model="businessShow"
                   trigger="manual">
-                <el-input
-                    style="width:300px;margin-bottom: 10px"
-                    placeholder="请输入内容"
-                    v-model="form.enterprisename"
-                    clearable
-                    @clear="businessSearch"
-                    size="mini"
-                    @keyup.enter.native="businessSearch">
-                  <i slot="prefix" class="el-icon-search" @click="businessSearch"></i>
-                </el-input>
+                <div style="margin-bottom: 10px;display: flex;justify-content: space-between">
+                  <el-input
+                      style="width:300px;"
+                      placeholder="请输入内容"
+                      v-model="form.enterprisename"
+                      clearable
+                      @clear="businessSearch"
+                      size="mini"
+                      @keyup.enter.native="businessSearch">
+                    <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
+                  </el-input>
+                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">
                     <template slot-scope="scope">

+ 13 - 10
src/Form/salerPrivatecustomer/edit.vue

@@ -23,16 +23,19 @@
                   width="900"
                   v-model="businessShow"
                   trigger="manual">
-                <el-input
-                    style="width:300px;margin-bottom: 10px"
-                    placeholder="请输入内容"
-                    v-model="form.enterprisename"
-                    clearable
-                    @clear="businessSearch"
-                    size="mini"
-                    @keyup.enter.native="businessSearch">
-                  <i slot="prefix" class="el-icon-search" @click="businessSearch"></i>
-                </el-input>
+                <div style="margin-bottom: 10px;display: flex;justify-content: space-between">
+                  <el-input
+                      style="width:300px;"
+                      placeholder="请输入内容"
+                      v-model="form.enterprisename"
+                      clearable
+                      @clear="businessSearch"
+                      size="mini"
+                      @keyup.enter.native="businessSearch">
+                    <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
+                  </el-input>
+                  <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+                </div>
                 <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
                   <el-table-column width="260" label="客户名称">
                     <template slot-scope="scope">

+ 2 - 13
src/HManagement/task/modules/add.vue

@@ -60,7 +60,7 @@
                 <span>&emsp;天</span>
               </el-form-item>
             </el-col>
-            <el-col :span="24">
+<!--            <el-col :span="24">
               <el-form-item label="上传附件:" prop="remindday">
                 <upload
                     ref="upload"
@@ -69,7 +69,7 @@
                     type="button">
                 </upload>
               </el-form-item>
-            </el-col>
+            </el-col>-->
             <el-col :span="24">
               <el-form-item label="执行人:" prop="leaderuserid">
                 <el-popover
@@ -186,15 +186,6 @@ export default {
 	},
 	methods:{
 		validateInput () {
-			/*if (!this.form.title) {
-				this.errormsg = '请输入标题'
-				return false
-			} else if (!this.form.starttime) {
-				this.errormsg = '请选择开始日期'
-				return false
-			} else {
-				this.submit()
-			}*/
       this.$refs.form.validate((valid)=>{
         if (!valid) return false
         this.submit()
@@ -206,7 +197,6 @@ export default {
 			this.leaderShow = false
 		},
     setAssist (val) {
-      console.log(val)
       this.assistPerson = ''
       this.assist = []
       val.forEach((item,index)=>{
@@ -283,7 +273,6 @@ export default {
       this.$refs.form.resetFields()
     },
     selectApplication(ownerid,ownertable){
-      console.log("11111",ownerid)
       this.followParam.content.ownertable = ownertable
       this.followParam.content.ownerid = ownerid
       this.form.ownertable = ownertable

+ 151 - 98
src/HManagement/task/modules/edit.vue

@@ -3,104 +3,125 @@
     <el-button v-show="tool.checkAuth($route.name,'update') && nowUserid === data.createuserid" size="mini" type="primary" @click="onShow(dialogTableVisible = true)">
         编 辑
     </el-button>
-    <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.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="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>
-						</el-input>
-					</el-popover>
-          <el-popover
-              placement="right"
-              trigger="manual"
-              width="400"
-              v-model="assistShow">
-            <member ref="memberAssist" :param="paramAssist" :radio="false" :implement="implement" @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>
-        <el-button type="warning" size="small" style="width:120px" @click="validateInput">保 存</el-button>
+    <el-drawer
+        title="编辑任务"
+        :visible.sync="dialogTableVisible"
+        size="700px"
+        direction="rtl"
+        append-to-body
+        :show-close="false"
+        @close="onClose">
+      <div class="drawer__panel">
+        <el-row :gutter="10">
+          <el-form :model="form" :rules="rules" ref="form" label-width="125px" label-position="right" size="mini">
+            <el-col :span="24">
+              <el-form-item label="任务标题:" prop="title">
+                <el-input v-model="form.title" placeholder="请输入任务标题" ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item label="关联应用数据:" prop="tableName">
+                <el-input v-model="form.tableName" placeholder="请选择关联应用数据" @focus="$refs.applicationRef.dialogTableVisible = true;$refs.applicationRef.listData()" readonly></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-button type="primary" size="mini" @click="$refs.followRef.dialogTableVisible = true;$refs.followRef.listData()" :disabled="followParam.content.ownerid === ''">同步跟进内容</el-button>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="任务内容:" prop="remarks">
+                <el-input  class="normal-margin" v-model="form.remarks" placeholder="输入任务内容" :autosize="{minRows:6}" type="textarea" show-word-limit maxlength="100" size="small"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="开始:" prop="starttime">
+                <el-date-picker
+                    v-model="form.starttime"
+                    type="date"
+                    placeholder="选择日期"
+                    value-format="yyyy-MM-dd"
+                    size="small">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="结束:" prop="endtime">
+                <el-date-picker
+                    v-model="form.endtime"
+                    type="date"
+                    placeholder="选择日期"
+                    value-format="yyyy-MM-dd"
+                    size="small">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="提醒时间:结束前" prop="remindday">
+                <el-input :disabled="!form.endtime" v-model="form.remindday" size="small" style="width:90px"></el-input>
+                <span>&emsp;天</span>
+              </el-form-item>
+            </el-col>
+<!--            <el-col :span="24">
+              <el-form-item label="上传附件:" prop="remindday">
+                <upload
+                    ref="upload"
+                    :folderid="folderid"
+                    :bindData="bindData"
+                    type="button">
+                </upload>
+              </el-form-item>
+            </el-col>-->
+            <el-col :span="24">
+              <el-form-item label="执行人:" prop="leaderuserid">
+                <el-popover
+                    placement="right"
+                    trigger="manual"
+                    width="400"
+                    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">
+                  </el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="协助人:" prop="remindday">
+                <el-popover
+                    placement="right"
+                    trigger="manual"
+                    width="400"
+                    v-model="assistShow">
+                  <member ref="memberAssist" :param="param" :implement="form.leaderuserid" :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">
+                  </el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" style="width:120px" @click="onClose">取 消</el-button>
+        <el-button type="primary" size="small" style="width:120px" @click="validateInput">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
+    <applicationData ref="applicationRef" @selectApplication="selectApplication"></applicationData>
+    <followData ref="followRef" :param="followParam" @follow="follow"></followData>
   </div>
 </template>
 <script>
 import member from '@/template/menber/index.vue'
 
 import upload from '@/components/upload/preview_upload.vue';
+
+import applicationData from "@/HManagement/task/components/applicationData";
+import followData from "@/HManagement/task/components/followData";
 export default {
 	props:['data'],
 	components:{
 		upload,
-		member
+		member,
+    applicationData,
+    followData
 	},
 	data () {
 		return {
@@ -124,6 +145,17 @@ export default {
           "userids":[],
         }
 			},
+      rules: {
+        title: [
+          {required: true, message: '请输入任务标题', trigger: 'blur'},
+        ],
+        starttime: [
+          {required: true, message: '请选择开始时间', trigger: 'change'},
+        ],
+        leaderuserid: [
+          {required: true, message: '请选择执行人', trigger: 'change'},
+        ],
+      },
 			// 查询可选择人员参数
 			param:{
         id:'20221018122201',
@@ -151,32 +183,36 @@ export default {
           }
         }
       },
-
 			errormsg:'',
 			bindData:{},
 			leader:{},
       assistPerson:'',
       assist:[],
-      implement:''
+      implement:'',
+      /*跟进列表*/
+      followParam:{
+        "id": 20231207130504,
+        "content": {
+          "ownertable": "",
+          "ownerid": ""
+        },
+      }
 		}
 	},
 	methods:{
 		onShow () {
 			this.form = Object.assign({},this.form,this.data)
+      console.log(this.form,'form表单数据')
 			this.leader = this.data.leader[0]?this.data.leader[0]:''
       this.implement = this.data.leader[0].userid
+      this.form.leaderuserid = this.data.leader[0].userid
       this.assistList(this.data.sys_taskid)
 		},
 		validateInput () {
-			if (!this.form.title) {
-				this.errormsg = '请输入标题'
-				return false
-			} else if (!this.form.starttime) {
-				this.errormsg = '请选择开始日期'
-				return false
-			} else {
-				this.submit()
-			}
+      this.$refs.form.validate((valid)=>{
+        if (!valid) return false
+        this.submit()
+      })
 		},
 		setLeader (val) {
 			this.leader = val[0]
@@ -276,6 +312,23 @@ export default {
         }
       })
       this.$emit('onSuccess')
+    },
+    onClose(){
+      this.dialogTableVisible = false
+      this.leader = {}
+      this.assistPerson = ''
+      this.assist = []
+      this.$refs.form.resetFields()
+    },
+    selectApplication(ownerid,ownertable){
+      this.followParam.content.ownertable = ownertable
+      this.followParam.content.ownerid = ownerid
+      this.form.ownertable = ownertable
+      this.form.ownerid = ownerid
+      this.form.tableName = ownertable === 'sat_orderclue'?'销售线索':ownertable === 'sa_customers'?'我的客户':ownertable === 'sa_porject'?'项目商机':''
+    },
+    follow(data){
+      this.form.remarks = data
     }
 	}
 }

+ 288 - 0
src/HManagement/task/modules/editCopy1.vue

@@ -0,0 +1,288 @@
+<template>
+  <div>
+    <el-button v-show="tool.checkAuth($route.name,'update') && nowUserid === data.createuserid" size="mini" type="primary" @click="onShow(dialogTableVisible = true)">
+        编 辑
+    </el-button>
+    <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.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="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>
+						</el-input>
+					</el-popover>
+          <el-popover
+              placement="right"
+              trigger="manual"
+              width="400"
+              v-model="assistShow">
+            <member ref="memberAssist" :param="paramAssist" :radio="false" :implement="implement" @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>
+        <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 {
+      leaderShow:false,
+      assistShow: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":"",
+        "team":{
+          "justuserids":true,
+          "userids":[],
+        }
+			},
+			// 查询可选择人员参数
+			param:{
+        id:'20221018122201',
+        content: {
+          "ownertable":'sys_task',
+          "ownerid":0,
+          "pageSize":20,
+          "where":{
+            "condition":"",
+            "withoutselect":0,
+
+          }
+        }
+      },
+      paramAssist:{
+        id:'20221018122201',
+        content: {
+          "ownertable":'sys_task',
+          "ownerid":0,
+          "pageSize":20,
+          "where":{
+            "condition":"",
+            "withoutselect":0,
+
+          }
+        }
+      },
+
+			errormsg:'',
+			bindData:{},
+			leader:{},
+      assistPerson:'',
+      assist:[],
+      implement:''
+		}
+	},
+	methods:{
+		onShow () {
+			this.form = Object.assign({},this.form,this.data)
+			this.leader = this.data.leader[0]?this.data.leader[0]:''
+      this.implement = this.data.leader[0].userid
+      this.assistList(this.data.sys_taskid)
+		},
+		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.implement = this.form.leaderuserid
+			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 () {
+      this.form.team.userids = this.assist
+			const res = await this.$api.requested({
+        "id": 20221211112101,
+        "content":this.form
+      })
+      this.tool.showMessage(res,()=>{
+				this.param.content.ownerid = res.data.sys_taskid
+				this.dialogTableVisible = false
+				this.refresh()
+				this.errormsg = ''
+        this.$emit('onSuccess')
+       /* this.insertAssist(res.data.sys_taskid)*/
+      })
+		},
+		refresh () {
+			this.form = {
+				"sys_taskid":0,
+        "title":"任务标题",
+        "remarks":"任务说明",
+        "starttime":"",
+        "remindday":0,
+        "ownertable":"",
+        "ownerid":0,
+        "endtime":""
+			}
+		},
+		showMenber () {
+			this.leaderShow = true
+      this.assistShow = false
+      this.param.content.ownerid = this.data.sys_taskid
+      this.$refs.member.listData()
+			// this.validateInput()
+		},
+    showMenberAssist () {
+      this.assistShow = true
+      this.leaderShow = false
+      this.paramAssist.content.ownerid = this.data.sys_taskid
+      this.$refs.memberAssist.listData()
+      // this.validateInput()
+    },
+    async assistList(id){
+      this.assistPerson = ''
+      this.assist = []
+      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){
+          if (index === 1){
+            this.assistPerson = e.name
+            this.assist
+          }else {
+            this.assistPerson = this.assistPerson + ',' + e.name
+          }
+        }
+        this.assist[index] = e.userid
+      })
+      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')
+    }
+	}
+}
+
+</script>
+<style scoped>
+.task__label{
+	color:rgb(173, 172, 172);
+}
+</style>

+ 14 - 11
src/components/businessMessage/index.vue

@@ -6,16 +6,19 @@
         trigger="manual"
         v-model="businessShow"
         >
-      <el-input
-          style="width:300px;margin-bottom: 10px"
-          placeholder="请输入内容"
-          v-model="keyWord"
-          clearable
-          @clear="businessSearch"
-          size="mini"
-          @keyup.enter.native="businessSearch">
-        <i slot="prefix" class="el-icon-search" @click="businessSearch"></i>
-      </el-input>
+      <div style="margin-bottom: 10px;display: flex;justify-content: space-between">
+        <el-input
+            style="width:300px;"
+            placeholder="请输入内容"
+            v-model="keyWord"
+            clearable
+            @clear="businessSearch"
+            size="mini"
+            @keyup.enter.native="businessSearch">
+          <i slot="prefix" class="el-icon-search" @click="businessSearch" ></i>
+        </el-input>
+        <el-button type="text" style="color: #333333" icon="el-icon-close" size="mini" @click="businessShow = false"></el-button>
+      </div>
       <el-table :data="businessData" @row-click="businessSelect" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini">
         <el-table-column width="260" label="客户名称">
           <template slot-scope="scope">
@@ -101,4 +104,4 @@ export default {
   display: flex;
   align-items: center;
 }
-</style>
+</style>

+ 2 - 2
src/components/normal-basic-layout/details/modules/task/addTask.vue

@@ -36,7 +36,7 @@
 				<el-input :disabled="!form.endtime" v-model="form.remindday" size="small" style="width:90px"></el-input>
 				<p>&emsp;天</p>
 			</div>
-			<div class="normal-margin">
+<!--			<div class="normal-margin">
 				<p class="task__label"><i class="el-icon-upload2"></i>&emsp;上传附件</p>
 				<upload
 					ref="upload"
@@ -44,7 +44,7 @@
 					:bindData="bindData"
 					type="button">
 				</upload>
-			</div>
+			</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">

+ 25 - 8
src/template/addProductContract/index.vue

@@ -14,7 +14,7 @@
           <span class="header-title">选择报价单:</span>
           <el-popover
               placement="bottom"
-              width="700"
+              width="820"
               trigger="click"
               v-model="queryShow"
               @show="queryQuotationData">
@@ -27,7 +27,7 @@
               <el-table-column
                   prop="status"
                   label="状态"
-                  width="180">
+                  width="100">
                 <template slot-scope="scope">
                   <span style="margin-left: 10px">{{ scope.row.status?scope.row.status:'--' }}</span>
                 </template>
@@ -41,18 +41,35 @@
                 </template>
               </el-table-column>
               <el-table-column
-                  prop="submitby"
-                  label="提交人"
+                  prop="enterprisename"
+                  label="客户名称"
                   width="180">
                 <template slot-scope="scope">
-                  <span style="margin-left: 10px">{{ scope.row.submitby?scope.row.submitby:'--' }}</span>
+                  <span style="margin-left: 10px">{{ scope.row.enterprisename?scope.row.enterprisename:'--'}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                  prop="specialoffer"
+                  label="是否特价"
+                  width="80">
+                <template slot-scope="scope">
+                  <span style="margin-left: 10px">{{ scope.row.specialoffer == '1'?'是':'否'}}</span>
                 </template>
               </el-table-column>
               <el-table-column
-                  prop="submitdate"
-                  label="提交时间">
+                  prop="leader"
+                  label="负责人"
+                  width="100">
+                <template slot-scope="scope">
+                  <span style="margin-left: 10px">{{ scope.row.leader?scope.row.leader.length > 0?scope.row.leader[0].name:'--':'--' }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                  prop="checkdate"
+                  label="审核时间"
+                  width="180">
                 <template slot-scope="scope">
-                  <span style="margin-left: 10px">{{ scope.row.submitdate?scope.row.submitdate:'--' }}</span>
+                  <span style="margin-left: 10px">{{ scope.row.checkdate?scope.row.checkdate:'--' }}</span>
                 </template>
               </el-table-column>
             </el-table>

+ 2 - 2
vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'http://192.168.3.13:8080',  // target host*!
+          target: 'http://61.164.207.46:8000',  // target host*/
+          // target: 'http://192.168.3.13:8080',  // target host*!
           // target: 'http://192.168.3.9:8090',  // target host*!
           // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host