编辑变推送、form插槽修改

src/components/base/baseNewForm/index.vue

@@ -90,7 +90,7 @@
                       :options="delTreeChildren(row.options)" :multiple="row.multiple?row.multiple:false"
                       :disabled="row.disabled?row.disabled:false" @clear="treeSelectClear" ref="selectTree"
                       :placeholder="!row.placeholder?'请选择':row.placeholder" @select="selectTree" />
-					<slot :name="row.slotName" v-if="row.tag === 'elSlot'"></slot>
+          <slot :name="row.slotName" v-if="row.tag === 'elSlot'" :row="ruleForm"></slot>
           <!-- <upload-file v-if="row.tag === 'uploadFile'" :showImgPath="ruleForm[row.prop]" ref="imgFile"
               @onImage="row.prop == 'beforeImgList'? getbeforeImgList:row.prop == 'materialsList'? getmaterialsList:row.prop == 'getmaterialsListAfter'?getmaterialsListAfter:getImage "></upload-file> -->
           <!-- <custom-cascader :name="row.prop" :field="row.prop" :ref="row.prop" class="w-100"
@@ -448,9 +448,9 @@ export default {
 }
 </style>
 <style scoped lang='scss'>
-	::v-deep textarea.el-textarea__inner{
+::v-deep textarea.el-textarea__inner{
   min-height: 100px !important;
-	}
+}
 .label {
   /* @include fontBase(16px, #333333) ; */
   color: #333;

src/views/newIntegrationTask/foregroundTask/index.vue

@@ -74,7 +74,7 @@ export default {
 
         {
           color: "#6a9af1",
-          text: "编辑",
+          text: "重推",
         },
         {
           color: "#d67a74",
@@ -137,15 +137,15 @@ export default {
     add() {
       this.$refs.rightDialog.openDialog("add");
     },
-    // 表格操作事件 查看 编辑 删除
+    // 表格操作事件 查看 重推 删除
     onFunc(index, row,item) {
       // 查看
       if (item.text==='查看') {
         this.openLoading("detail");
         this.$refs.rightDialog.openDialog("show", row);
       }
-      // 编辑
+      // 重推
-      if (item.text==='编辑') {
+      if (item.text==='重推') {
         this.openLoading("detail");
         this.$refs.rightDialog.openDialog("edit", row);
       }

src/views/newIntegrationTask/foregroundTask/rightDialog.vue

@@ -42,7 +42,7 @@
         :funData="funData"
         @onFunc="onFunc"
       >
-<!--        编码-->
+        <!--        编码-->
         <template v-slot:argName="{ row }">
           <div style="width: 100%">
             {{row.argName}}
@@ -50,7 +50,7 @@
         </template>
         <template v-slot:argValue="{ row }">
           <div style="width: 100%">
-<!--            若参数类型为1 （字符串） 否则为2 （日期）-->
+            <!--            若参数类型为1 （字符串） 否则为2 （日期）-->
             <template v-if="row.argType==1">
               <template v-if="!submitShow">{{row.argValue}}</template>
               <el-input
@@ -217,8 +217,7 @@ export default {
       this.formRow = configData.formRow;
       this.submitShow = true;
       this.isEdit = false
-      this.funData = [
+      this.funData = []
-      ]
       // 新增
       if (type == "add") {
         this.dialogTitle = "新增";

src/views/newIntegrationTask/plugInOptions/rightDialog.vue

@@ -65,10 +65,18 @@
         </template>
         <template v-slot:argType="{ row }">
           <div style="width: 100%">
-            <el-radio-group v-model="row.argType" :disabled="!submitShow">
+<!--            <el-radio-group v-model="row.argType" :disabled="!submitShow">-->
-              <el-radio label="1">字符串</el-radio>
+<!--              <el-radio label="1">字符串</el-radio>-->
-              <el-radio label="2">日期</el-radio>
+<!--              <el-radio label="2">日期</el-radio>-->
-            </el-radio-group>
+<!--            </el-radio-group>-->
+            <el-select v-model="row.argType" placeholder="请选择">
+              <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           </div>
         </template>
         <template v-slot:remark="{ row }">
@@ -116,6 +124,28 @@ export default {
       funData: [],
       isEdit: false,
       select_dist:{},
+      options:[
+        {
+          label:"字符串",
+          value:"1"
+        },
+        {
+          label:"日期范围选择",
+          value:"2"
+        },
+        {
+          label:"年月",
+          value:"3"
+        },
+        {
+          label:"年月日",
+          value:"4"
+        },
+        {
+          label:"年月日时间",
+          value:"5"
+        },
+      ]
     };
   },
   mounted() {