任务调整暂存

src/HDrpManagement/salerPortrait/modules/detail.vue

@@ -122,16 +122,16 @@
                     {{scope.data.data.sumamount && tool.formatAmount(scope.data.data.sumamount || 0,2,'￥')  }}
                   </div>
                   <div v-else-if="scope.data.columnname == 'writeoffamount'">
-                    {{scope.data.data.writeoffamount && tool.formatAmount(scope.data.data.writeoffamount || 0,2,'￥')  }}
+                    <span :style="{color:param2.content.sort[0].sortid == '175'?'#3874F6':''}">{{scope.data.data.writeoffamount && tool.formatAmount(scope.data.data.writeoffamount || 0,2,'￥')  }}</span>
                   </div>
                   <div v-else-if="scope.data.columnname == 'unoutOrderamount'">
-                    {{scope.data.data.unoutOrderamount && tool.formatAmount(scope.data.data.unoutOrderamount || 0,2,'￥')  }}
+                    <span :style="{color:param2.content.sort[0].sortid == '172'?'#3874F6':''}">{{scope.data.data.unoutOrderamount && tool.formatAmount(scope.data.data.unoutOrderamount || 0,2,'￥')  }}</span>
                   </div>
                   <div v-else-if="scope.data.columnname == 'uninvoicamount'">
-                    {{scope.data.data.uninvoicamount && tool.formatAmount(scope.data.data.uninvoicamount || 0,2,'￥')  }}
+                    <span :style="{color:param2.content.sort[0].sortid == '173'?'#3874F6':''}">{{scope.data.data.uninvoicamount && tool.formatAmount(scope.data.data.uninvoicamount || 0,2,'￥')  }}</span>
                   </div>
                   <div v-else-if="scope.data.columnname == 'unwriteoffamount'">
-                    {{scope.data.data.unwriteoffamount && tool.formatAmount(scope.data.data.unwriteoffamount || 0,2,'￥')  }}
+                    <span :style="{color:param2.content.sort[0].sortid == '174'?'#3874F6':''}">{{scope.data.data.unwriteoffamount && tool.formatAmount(scope.data.data.unwriteoffamount || 0,2,'￥')  }}</span>
                   </div>
                   <div v-else>
                     {{ scope.data.data[scope.data.columnname] }}

src/HManagement/task/modules/add.vue

@@ -3,94 +3,104 @@
     <el-button size="small" type="primary" @click="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;提醒时间：结束前&nbsp;</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="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">
-              <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-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="24">
+              <el-form-item label="关联应用数据:" prop="tableName">
+                <el-input v-model="form.tableName" placeholder="请选择关联应用数据" ></el-input>
+              </el-form-item>
+            </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="dialogTableVisible = false">取 消</el-button>
-        <el-button type="warning" size="small" style="width:120px" @click="validateInput">创 建</el-button>
+        <el-button type="primary" size="small" style="width:120px" @click="validateInput">创 建</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
   </div>
 </template>
 <script>
@@ -119,11 +129,23 @@ export default {
         "ownerid":0,
         "endtime":"",
 				"leaderuserid":"",
+        "tableName":'',
         "team":{
           "justuserids":true,
           "userids":[],
         }
 			},
+      rules: {
+        title: [
+          {required: true, message: '请输入任务标题', trigger: 'blur'},
+        ],
+        starttime: [
+          {required: true, message: '请选择开始时间', trigger: 'change'},
+        ],
+        leaderuserid: [
+          {required: true, message: '请选择执行人', trigger: 'change'},
+        ],
+      },
 			// 查询可选择人员参数
 			param:{
         id:'20221018122201',
@@ -231,7 +253,8 @@ export default {
           "justuserids":true
         }
       })
-    }
+    },
+    onClose(){}
 	}
 }
 

src/HManagement/task/modules/addcopy1.vue

@@ -0,0 +1,243 @@
+<template>
+  <div>
+    <el-button size="small" type="primary" @click="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;提醒时间：结束前&nbsp;</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="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">
+              <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 {
+      leaderShow:false,
+      assistShow:false,
+			dialogTableVisible:false,
+			folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
+			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,
+
+          }
+        }
+      },
+			errormsg:'',
+			bindData:{},
+			leader:{},
+      assist:[],
+      assistPerson:''
+		}
+	},
+	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.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.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 = ''
+       /* 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.$refs.member.listData()
+			// this.validateInput()
+		},
+    showMenberAssist () {
+      this.assistShow = true
+      this.leaderShow = false
+      this.$refs.memberAssist.listData()
+      // this.validateInput()
+    },
+    async insertAssist(id){
+      const res = await this.$api.requested({
+        "id": 20220930103601,
+        "content": {
+          "ownertable":"sys_task",
+          "ownerid":id,
+          "userids":this.assist,
+          "justuserids":true
+        }
+      })
+    }
+	}
+}
+
+</script>
+<style scoped>
+.task__label{
+	color:rgb(173, 172, 172);
+}
+</style>