yuanyuan 3 سال پیش
والد
کامیت
00b216be62
3فایلهای تغییر یافته به همراه71 افزوده شده و 23 حذف شده
  1. 1 1
      src/main/jmrh/src/mixins/pageableTable.js
  2. 44 8
      src/main/jmrh/src/views/mine/release.vue
  3. 26 14
      src/main/jmrh/src/views/resourceRelease.vue

+ 1 - 1
src/main/jmrh/src/mixins/pageableTable.js

@@ -8,7 +8,7 @@ export default {
             tableData: [],
             typeStr: [],
             sort: {},
-            sortStr: '',
+            sortStr: 'createdAt,desc',
             tableHeight: 200,
             yylyList: [],
             sblxList: [],

+ 44 - 8
src/main/jmrh/src/views/mine/release.vue

@@ -42,9 +42,15 @@
                                     编辑
                                 </div>
                                 <div class="red">当前对接&nbsp;{{ n.count ? n.count : 0 }}</div>
-                                <div class="under_review" v-if="n.status != 'PASS'">
+                                <div class="under_review" v-if="n.status == 'PASS'">
+                                    审核通过
+                                </div>
+                                <div class="under_review" v-if="n.status == 'PENDING'">
                                     审核中
                                 </div>
+                                <div class="under_review" v-if="n.status == 'DENY'">
+                                    审核失败
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -64,9 +70,15 @@
                                     编辑
                                 </div>
                                 <div class="red">当前对接&nbsp;{{ n.count ? n.count : 0 }}</div>
-                                <div class="under_review" v-if="n.status != 'PASS'">
+                                <div class="under_review" v-if="n.status == 'PASS'">
+                                    审核通过
+                                </div>
+                                <div class="under_review" v-if="n.status == 'PENDING'">
                                     审核中
                                 </div>
+                                <div class="under_review" v-if="n.status == 'DENY'">
+                                    审核失败
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -86,9 +98,15 @@
                                     编辑
                                 </div>
                                 <div class="red">当前对接&nbsp;{{ n.count ? n.count : 0 }}</div>
-                                <div class="under_review" v-if="n.status != 'PASS'">
+                                <div class="under_review" v-if="n.status == 'PASS'">
+                                    审核通过
+                                </div>
+                                <div class="under_review" v-if="n.status == 'PENDING'">
                                     审核中
                                 </div>
+                                <div class="under_review" v-if="n.status == 'DENY'">
+                                    审核失败
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -142,9 +160,15 @@
                             <div class="btn">
                                 <div class="red">当前对接&nbsp;{{ n.count ? n.count : 0 }}</div>
                                 <div class="edit" @click="toNeedShow(n)">编辑</div>
-                                <div class="under_review" v-if="n.status != 'PASS'">
+                                <div class="under_review" v-if="n.status == 'PASS'">
+                                    审核通过
+                                </div>
+                                <div class="under_review" v-if="n.status == 'PENDING'">
                                     审核中
                                 </div>
+                                <div class="under_review" v-if="n.status == 'DENY'">
+                                    审核失败
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -167,9 +191,15 @@
                             <div class="btn">
                                 <div class="red">当前对接&nbsp;{{ n.count ? n.count : 0 }}</div>
                                 <div class="edit" @click="toNeedShow(n)">编辑</div>
-                                <div class="under_review" v-if="n.status != 'PASS'">
+                                <div class="under_review" v-if="n.status == 'PASS'">
+                                    审核通过
+                                </div>
+                                <div class="under_review" v-if="n.status == 'PENDING'">
                                     审核中
                                 </div>
+                                <div class="under_review" v-if="n.status == 'DENY'">
+                                    审核失败
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -200,9 +230,15 @@
                             <div class="btn">
                                 <div class="red">当前对接&nbsp;{{ n.count ? n.count : 0 }}</div>
                                 <div class="edit" @click="toNeedShow(n)">编辑</div>
-                                <div class="under_review" v-if="n.status != 'PASS'">
+                                <div class="under_review" v-if="n.status == 'PASS'">
+                                    审核通过
+                                </div>
+                                <div class="under_review" v-if="n.status == 'PENDING'">
                                     审核中
                                 </div>
+                                <div class="under_review" v-if="n.status == 'DENY'">
+                                    审核失败
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -478,7 +514,7 @@ export default {
         }
         .under_review {
             cursor: pointer;
-            width: 56px;
+            width: 70px;
             height: 26px;
             line-height: 26px;
             border-radius: 2px;
@@ -584,7 +620,7 @@ export default {
         }
         .under_review {
             cursor: pointer;
-            width: 56px;
+            width: 70px;
             height: 26px;
             line-height: 26px;
             border-radius: 2px;

+ 26 - 14
src/main/jmrh/src/views/resourceRelease.vue

@@ -113,15 +113,15 @@
             </div>
             <el-dialog :visible.sync="showDialog" title="联系对接" width="540px" center>
                 <div style="padding-right:100px">
-                    <el-form label-width="120px" label-position="right" :model="formData" :rules="rules">
+                    <el-form label-width="120px" label-position="right" :model="formData" :rules="rules" ref="form">
                         <el-form-item prop="orgName" label="单位名称">
                             <el-input v-model="formData.orgName" placeholder="请输入单位名称"></el-input>
                         </el-form-item>
-                        <el-form-item prop="contact" label="联系人">
-                            <el-input v-model="formData.contact" placeholder="请输入联系人"></el-input>
+                        <el-form-item prop="contactName" label="联系人">
+                            <el-input v-model="formData.contactName" placeholder="请输入联系人"></el-input>
                         </el-form-item>
-                        <el-form-item prop="phone" label="联系方式">
-                            <el-input v-model="formData.phone" placeholder="请输入联系方式"></el-input>
+                        <el-form-item prop="contactPhone" label="联系方式">
+                            <el-input v-model="formData.contactPhone" placeholder="请输入联系方式"></el-input>
                         </el-form-item>
                         <el-form-item prop="description" label="对接描述">
                             <el-input
@@ -168,8 +168,8 @@ export default {
             src: require('../assets/icon_collect_pre.png'),
             rules: {
                 orgName: [{ required: true, message: '请输入单位名称', trigger: 'blur' }],
-                contact: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-                phone: [{ required: true, message: '请输入联系方式', trigger: 'blur' }],
+                contactName: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+                contactPhone: [{ required: true, message: '请输入联系方式', trigger: 'blur' }],
                 description: [{ required: true, message: '请填写对接描述', trigger: 'blur' }]
             },
             orgInfo: {},
@@ -194,7 +194,6 @@ export default {
     },
     methods: {
         saveMess() {
-            this.showDialog = false;
             if (this.$route.query.id) {
                 // var data;
                 // if (this.$route.query.type == 'PRODUCT_SUPPLY') {
@@ -213,8 +212,22 @@ export default {
                 //         name: this.list.name
                 //     };
                 // }
-                this.formData.sndId = this.$route.query.id;
-                this.save('/conversation/create', this.formData);
+                this.$refs.form.validate(valid => {
+                    if (valid) {
+                        this.formData.sndId = this.$route.query.id;
+                        this.formData.content =
+                            this.formData.orgName +
+                            ',' +
+                            this.formData.contactName +
+                            ',' +
+                            this.formData.contactPhone +
+                            ',' +
+                            this.formData.description;
+                        this.save('/conversation/create', this.formData);
+                    } else {
+                        return false;
+                    }
+                });
             }
             this.$refs.resetFields();
         },
@@ -331,10 +344,9 @@ export default {
             this.$http
                 .post(url, data)
                 .then(res => {
-                    if (res) {
-                        this.$refs['formData'].resetFields();
-                        this.$message.success('对接成功');
-                    }
+                    this.$message.success('对接成功');
+                    this.showDialog = false;
+                    this.$refs['formData'].resetFields();
                 })
                 .catch(e => {
                     console.log(e);