|
@@ -27,34 +27,34 @@
|
|
<InfoCircleOutlined />
|
|
<InfoCircleOutlined />
|
|
主要用于执行任务的触发的条件,满足条件才可进入群发,转人工的动作
|
|
主要用于执行任务的触发的条件,满足条件才可进入群发,转人工的动作
|
|
</div>
|
|
</div>
|
|
- <!-- <FormItem
|
|
|
|
|
|
+ <FormItem
|
|
label="回复情况"
|
|
label="回复情况"
|
|
name="conditionType"
|
|
name="conditionType"
|
|
:rules="[{ required: true, message: '请选择回复情况' }]"
|
|
:rules="[{ required: true, message: '请选择回复情况' }]"
|
|
- > -->
|
|
|
|
- <!-- <Radio.Group v-model:value="form.conditionType"> -->
|
|
|
|
- <!-- <Radio value="2">客户不回复</Radio> -->
|
|
|
|
- <!-- <Radio value="1">客户回复</Radio> -->
|
|
|
|
- <!-- </Radio.Group> -->
|
|
|
|
- <!-- </FormItem> -->
|
|
|
|
- <!-- <FormItem
|
|
|
|
|
|
+ >
|
|
|
|
+ <Radio.Group v-model:value="form.conditionType">
|
|
|
|
+ <Radio value="2">客户不回复</Radio>
|
|
|
|
+ <Radio value="1">客户回复</Radio>
|
|
|
|
+ </Radio.Group>
|
|
|
|
+ </FormItem>
|
|
|
|
+ <FormItem
|
|
v-show="form.conditionType === '2'"
|
|
v-show="form.conditionType === '2'"
|
|
class="no-colon"
|
|
class="no-colon"
|
|
label="超时时间"
|
|
label="超时时间"
|
|
- name="timeout"
|
|
|
|
|
|
+ name="noReplyCondition"
|
|
>
|
|
>
|
|
<div style="display: flex; align-items: center">
|
|
<div style="display: flex; align-items: center">
|
|
超过
|
|
超过
|
|
<Input
|
|
<Input
|
|
- v-model:value="form.timeout"
|
|
|
|
|
|
+ v-model:value="form.noReplyCondition"
|
|
:style="{ width: '80px', margin: '0 5px' }"
|
|
:style="{ width: '80px', margin: '0 5px' }"
|
|
:rules="[{ required: true, message: '请输入' }]"
|
|
:rules="[{ required: true, message: '请输入' }]"
|
|
/>
|
|
/>
|
|
- 小时,执行该动作
|
|
|
|
|
|
+ 分钟,执行该动作
|
|
</div>
|
|
</div>
|
|
- </FormItem> -->
|
|
|
|
- <!-- v-show="form.conditionType === '1'" -->
|
|
|
|
|
|
+ </FormItem>
|
|
<FormItem
|
|
<FormItem
|
|
|
|
+ v-show="form.conditionType === '1'"
|
|
label="回复内容"
|
|
label="回复内容"
|
|
name="content"
|
|
name="content"
|
|
required
|
|
required
|
|
@@ -66,7 +66,7 @@
|
|
</FormItem>
|
|
</FormItem>
|
|
<!-- 具体内容 -->
|
|
<!-- 具体内容 -->
|
|
<FormItem
|
|
<FormItem
|
|
- v-show="form.content === 'concreteContent'"
|
|
|
|
|
|
+ v-show="form.conditionType === '1' && form.content === 'concreteContent'"
|
|
label="具体内容"
|
|
label="具体内容"
|
|
name="conditionList"
|
|
name="conditionList"
|
|
:rules="[{ required: true, message: '请输入' }]"
|
|
:rules="[{ required: true, message: '请输入' }]"
|
|
@@ -303,8 +303,8 @@
|
|
let actionLabel = store.sopLabelList;
|
|
let actionLabel = store.sopLabelList;
|
|
const form = reactive({
|
|
const form = reactive({
|
|
nodeName: '', //节点名称
|
|
nodeName: '', //节点名称
|
|
- // conditionType: '1', //触发条件:1为客户回复,2为客户不回复
|
|
|
|
- timeout: '',
|
|
|
|
|
|
+ conditionType: '1', //触发条件:1为客户回复,2为客户不回复
|
|
|
|
+ noReplyCondition: undefined,
|
|
content: 'concreteContent',
|
|
content: 'concreteContent',
|
|
conditionList: [{ expression: '' }],
|
|
conditionList: [{ expression: '' }],
|
|
});
|
|
});
|
|
@@ -319,8 +319,8 @@
|
|
// }}
|
|
// }}
|
|
const initialForm = reactive({
|
|
const initialForm = reactive({
|
|
nodeName: '',
|
|
nodeName: '',
|
|
- // conditionType: '1',
|
|
|
|
- timeout: '',
|
|
|
|
|
|
+ conditionType: '1',
|
|
|
|
+ noReplyCondition: undefined,
|
|
content: 'concreteContent',
|
|
content: 'concreteContent',
|
|
conditionList: [{ expression: '' }],
|
|
conditionList: [{ expression: '' }],
|
|
});
|
|
});
|
|
@@ -380,7 +380,7 @@
|
|
.validate()
|
|
.validate()
|
|
.then((res) => {
|
|
.then((res) => {
|
|
const allValid = res.conditionList.every(item => item.expression.trim()!== '');
|
|
const allValid = res.conditionList.every(item => item.expression.trim()!== '');
|
|
- if(!allValid){
|
|
|
|
|
|
+ if(form.conditionType === '1' && form.content === 'concreteContent' && !allValid){
|
|
message.warning('请填写完整具体内容!')
|
|
message.warning('请填写完整具体内容!')
|
|
return;
|
|
return;
|
|
}else{
|
|
}else{
|
|
@@ -425,7 +425,8 @@
|
|
// 填充 form 数据
|
|
// 填充 form 数据
|
|
Object.assign(form, {
|
|
Object.assign(form, {
|
|
nodeName: data.data.name,
|
|
nodeName: data.data.name,
|
|
- // conditionType: String(data.data.conditionType),
|
|
|
|
|
|
+ conditionType: String(data.data.conditionType),
|
|
|
|
+ noReplyCondition: data.data.noReplyCondition,
|
|
conditionOperator: String(data.data.conditionOperator),
|
|
conditionOperator: String(data.data.conditionOperator),
|
|
conditionList: conArray,
|
|
conditionList: conArray,
|
|
});
|
|
});
|
|
@@ -451,17 +452,18 @@
|
|
if (!btnDisabled.value) {
|
|
if (!btnDisabled.value) {
|
|
console.log(' status', !btnDisabled.value);
|
|
console.log(' status', !btnDisabled.value);
|
|
// 提交表单逻辑
|
|
// 提交表单逻辑
|
|
- // const { nodeName, conditionType, conditionList } = form;
|
|
|
|
- const { nodeName, conditionList } = form;
|
|
|
|
|
|
+ const { nodeName, conditionType, conditionList ,noReplyCondition} = form;
|
|
|
|
+ // const { nodeName, conditionList } = form;
|
|
const { taskType, sendType, actionMessage, tagValue } = taskForm;
|
|
const { taskType, sendType, actionMessage, tagValue } = taskForm;
|
|
-
|
|
|
|
|
|
+ console.log('actionMessage',actionMessage)
|
|
const listCon = conditionList.map((item) => {
|
|
const listCon = conditionList.map((item) => {
|
|
return item.expression;
|
|
return item.expression;
|
|
});
|
|
});
|
|
const requestData = {
|
|
const requestData = {
|
|
name: nodeName,
|
|
name: nodeName,
|
|
- conditionType: 1,
|
|
|
|
|
|
+ conditionType: Number(conditionType),
|
|
conditionList: listCon,
|
|
conditionList: listCon,
|
|
|
|
+ noReplyCondition: Number(noReplyCondition),
|
|
taskType,
|
|
taskType,
|
|
sendType,
|
|
sendType,
|
|
actionMessage,
|
|
actionMessage,
|