yuhan 1 year ago
parent
commit
8a8f2be91a

+ 25 - 17
src/views/module_kzks/projectPushList/ProjectPushListList.vue

@@ -10,15 +10,13 @@
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="成本类型">
-              <!-- <a-input placeholder="请输入成本类型" v-model="queryParam.costType"></a-input> -->
-              <j-dict-select-tag type="list" v-model="queryParam.costType" dictCode="project_push_type" placeholder="请选择成本类型" />
+            <a-form-item label="推送类型">
+              <j-dict-select-tag type="list" v-model="queryParam.pushType" dictCode="push_type" placeholder="请选择推送类型" />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="推送类型">
-              <!-- <a-input placeholder="请输入成本类型" v-model="queryParam.costType"></a-input> -->
-              <j-dict-select-tag type="list" v-model="queryParam.costType" dictCode="push_type" placeholder="请选择推送类型" />
+            <a-form-item label="成本类型">
+              <j-dict-select-tag type="list" v-model="queryParam.costType" dictCode="project_push_type" placeholder="请选择成本类型" />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -167,17 +165,27 @@
             dataIndex: 'taskname'
             dataIndex: 'taskname'
           },
           },
           // {
           // {
-          //   title:'推送设置ID',
-          //   align:"center",
-          //   dataIndex: 'pushSetId'
-          // },
-          {
-            title:'推送至',
-            align:"center",
-            dataIndex: 'pushTo_dictText'
-          },
-          {
-            title:'推送内容',
+            //   title:'推送设置ID',
+            //   align:"center",
+            //   dataIndex: 'pushSetId'
+            // },
+            {
+              title:'推送至',
+              align:"center",
+              dataIndex: 'pushTo_dictText'
+            },
+            {
+              title:'推送类型',
+              align:"center",
+              dataIndex: 'pushType_dictText'
+            },
+            {
+              title:'成本类型',
+              align:"center",
+              dataIndex: 'costType_dictText'
+            },
+            {
+              title:'推送内容',
             align:"center",
             align:"center",
             dataIndex: 'content'
             dataIndex: 'content'
           },
           },

+ 7 - 2
src/views/module_kzks/projectPushSet/ProjectPushSetList.vue

@@ -7,7 +7,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <a-form-item label="成本类型">
             <a-form-item label="成本类型">
               <!-- <a-input placeholder="请输入成本类型" v-model="queryParam.costType"></a-input> -->
               <!-- <a-input placeholder="请输入成本类型" v-model="queryParam.costType"></a-input> -->
-              <j-dict-select-tag type="list" v-model="queryParam.costType" dictCode="project_push_type" placeholder="请选择成本类型" />
+              <j-dict-select-tag ref="projectPushType" type="list" v-model="queryParam.costType" dictCode="project_push_type" placeholder="请选择成本类型" />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -190,7 +190,12 @@
       }
       }
     },
     },
     created() {
     created() {
-    this.getSuperFieldList();
+      this.getSuperFieldList();
+      this.$nextTick(res => {
+        this.$refs.projectPushType.dictOptions = this.$refs.projectPushType.dictOptions.filter(item => {
+          return item.value<5
+        })
+      })
     },
     },
     computed: {
     computed: {
       importExcelUrl: function(){
       importExcelUrl: function(){

+ 6 - 1
src/views/module_kzks/projectPushSet/modules/ProjectPushSetForm.vue

@@ -6,7 +6,7 @@
           <a-col :span="24">
           <a-col :span="24">
             <a-form-model-item label="成本类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="costType">
             <a-form-model-item label="成本类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="costType">
               <!-- <a-input v-model="model.costType" placeholder="请输入成本类型"  ></a-input> -->
               <!-- <a-input v-model="model.costType" placeholder="请输入成本类型"  ></a-input> -->
-              <j-dict-select-tag type="list" v-model="model.costType" dictCode="project_push_type" placeholder="请选择要推送的成本类型" />
+              <j-dict-select-tag ref="projectPushType" type="list" v-model="model.costType" dictCode="project_push_type" placeholder="请选择要推送的成本类型" />
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
           <a-col :span="24" v-if="model.costType != '3' && model.costType != '4'">
           <a-col :span="24" v-if="model.costType != '3' && model.costType != '4'">
@@ -109,6 +109,11 @@
     created () {
     created () {
        //备份model原始值
        //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
+      this.$nextTick(res => {
+        this.$refs.projectPushType.dictOptions = this.$refs.projectPushType.dictOptions.filter(item => {
+          return item.value<5
+        })
+      })
     },
     },
     methods: {
     methods: {
       add () {
       add () {