1

src/views/account/agentmech/parts/form-1.vue

@@ -9,8 +9,8 @@
             <van-picker show-toolbar :columns="pidList" value-key="name" @confirm="pidCon" @cancel="showPicker = false" />
           </van-popup>
           <van-field v-model="form.mech_name" name="mech_name" label="机构名称" :rules="[{ required: true, message: '机构名称' }]" />
-          <van-field v-model="form.name" name="name" label="姓名" :rules="[{ required: true, message: '姓名' }]" />
-          <van-field v-model="form.phone" name="phone" label="手机号" :rules="[{ required: true, message: '手机号' }]" />
+          <van-field v-model="form.phone" name="phone" label="账号" :rules="[{ required: true, message: '账号' }]" />
+          <van-field v-model="form.name" name="name" label="联系电话" :rules="[{ required: true, message: '联系电话' }]" />
           <van-field v-model="form.password" name="password" label="密码" type="password" :rules="[{ required: true, message: '密码' }]" v-if="!form.id" />
           <div style="margin: 16px">
             <van-button round block type="info" native-type="submit">提交</van-button>

src/views/account/agentmech/parts/list-1.vue

@@ -3,14 +3,14 @@
     <van-col span="24" class="main">
       <van-col span="24" class="list" v-for="(item, index) in list" :key="index">
         <van-col span="24" class="title">
-          {{ item.name }}
+          {{ item.phone }}
         </van-col>
         <van-col span="24" class="other">
           <van-col span="24" class="otherInfo">
             机构名称:<span>{{ item.mech_name || '暂无' }}</span>
           </van-col>
           <van-col span="24" class="otherInfo">
-            联系电话:<span>{{ item.phone || '暂无' }}</span>
+            联系电话:<span>{{ item.name || '暂无' }}</span>
           </van-col>
         </van-col>
         <van-col span="24" class="btn">

src/views/account/answertea/parts/form-1.vue

@@ -12,8 +12,8 @@
               </van-radio-group>
             </template>
           </van-field>
-          <van-field v-model="form.name" name="name" label="姓名" :rules="[{ required: true, message: '机构名称' }]" />
-          <van-field v-model="form.phone" name="phone" label="手机号" :rules="[{ required: true, message: '机构名称' }]" />
+          <van-field v-model="form.phone" name="phone" label="账号" :rules="[{ required: true, message: '账号' }]" />
+          <van-field v-model="form.name" name="name" label="联系电话" :rules="[{ required: true, message: '联系电话' }]" />
           <van-field
             v-model="form.password"
             name="password"
@@ -22,13 +22,13 @@
             :rules="[{ required: true, message: '登录密码' }]"
             v-if="!form.id"
           />
-          <van-field v-model="form.card" name="card" label="身份证号" :rules="[{ required: false, message: '机构名称' }]" />
-          <van-field v-model="form.email" name="email" label="电子邮箱" :rules="[{ required: false, message: '机构名称' }]" />
-          <van-field v-model="form.address" name="address" label="联系地址" :rules="[{ required: false, message: '机构名称' }]" />
-          <van-field v-model="form.zwzc" name="zwzc" label="职务职称" :rules="[{ required: false, message: '机构名称' }]" />
-          <van-field v-model="form.school" name="school" label="院校" :rules="[{ required: false, message: '机构名称' }]" />
-          <van-field v-model="form.major" name="major" label="专业" :rules="[{ required: false, message: '机构名称' }]" />
-          <van-field v-model="form.word_tel" name="word_tel" label="办公电话" :rules="[{ required: false, message: '机构名称' }]" />
+          <van-field v-model="form.card" name="card" label="身份证号" :rules="[{ required: false, message: '身份证号' }]" />
+          <van-field v-model="form.email" name="email" label="电子邮箱" :rules="[{ required: false, message: '电子邮箱' }]" />
+          <van-field v-model="form.address" name="address" label="联系地址" :rules="[{ required: false, message: '联系地址' }]" />
+          <van-field v-model="form.zwzc" name="zwzc" label="职务职称" :rules="[{ required: false, message: '职务职称' }]" />
+          <van-field v-model="form.school" name="school" label="院校" :rules="[{ required: false, message: '院校' }]" />
+          <van-field v-model="form.major" name="major" label="专业" :rules="[{ required: false, message: '专业' }]" />
+          <van-field v-model="form.word_tel" name="word_tel" label="办公电话" :rules="[{ required: false, message: '办公电话' }]" />
           <div style="margin: 16px">
             <van-button round block type="info" native-type="submit">提交</van-button>
           </div>

src/views/account/answertea/parts/list-1.vue

@@ -3,14 +3,14 @@
     <van-col span="24" class="main">
       <van-col span="24" class="list" v-for="(item, index) in list" :key="index">
         <van-col span="24" class="title">
-          {{ item.name }}
+          {{ item.phone }}
         </van-col>
         <van-col span="24" class="other">
           <van-col span="24" class="otherInfo">
             用户类型:<span>{{ item.type == '1' ? '咨询师' : item.type == '2' ? '代理师' : '分析师' }}</span>
           </van-col>
           <van-col span="24" class="otherInfo">
-            联系电话:<span>{{ item.phone || '暂无' }}</span>
+            联系电话:<span>{{ item.name || '暂无' }}</span>
           </van-col>
         </van-col>
         <van-col span="24" class="btn">

src/views/account/basic/parts/info-4.vue

@@ -5,8 +5,8 @@
         <van-form @submit="onSubmit">
           <van-field v-model="form.id" name="id" label="数据id" style="display: none" />
           <van-field v-model="form.mech_name" name="mech_name" label="机构名称" :rules="[{ required: true, message: '机构名称' }]" />
-          <van-field v-model="form.name" name="name" label="姓名" :rules="[{ required: true, message: '姓名' }]" />
-          <van-field v-model="form.phone" name="phone" label="手机号" :rules="[{ required: true, message: '手机号' }]" />
+          <van-field v-model="form.phone" name="phone" label="账号" :rules="[{ required: true, message: '账号' }]" disabled />
+          <van-field v-model="form.name" name="name" label="联系电话" :rules="[{ required: true, message: '联系电话' }]" />
           <div style="margin: 16px">
             <van-button round block type="info" native-type="submit">提交</van-button>
           </div>

src/views/account/basic/parts/info-5.vue

@@ -13,15 +13,15 @@
               </van-radio-group>
             </template>
           </van-field>
-          <van-field v-model="form.name" name="name" label="姓名" :rules="[{ required: true, message: '机构名称' }]" />
-          <van-field v-model="form.phone" name="phone" label="手机号" :rules="[{ required: true, message: '机构名称' }]" />
-          <van-field v-model="form.card" name="card" label="身份证号" :rules="[{ required: false, message: '机构名称' }]" />
-          <van-field v-model="form.email" name="email" label="电子邮箱" :rules="[{ required: false, message: '机构名称' }]" />
-          <van-field v-model="form.address" name="address" label="联系地址" :rules="[{ required: false, message: '机构名称' }]" />
-          <van-field v-model="form.zwzc" name="zwzc" label="职务职称" :rules="[{ required: false, message: '机构名称' }]" />
-          <van-field v-model="form.school" name="school" label="院校" :rules="[{ required: false, message: '机构名称' }]" />
-          <van-field v-model="form.major" name="major" label="专业" :rules="[{ required: false, message: '机构名称' }]" />
-          <van-field v-model="form.word_tel" name="word_tel" label="办公电话" :rules="[{ required: false, message: '机构名称' }]" />
+          <van-field v-model="form.phone" name="phone" label="账号" :rules="[{ required: true, message: '账号' }]" disabled />
+          <van-field v-model="form.name" name="name" label="联系电话" :rules="[{ required: true, message: '联系电话' }]" />
+          <van-field v-model="form.card" name="card" label="身份证号" :rules="[{ required: false, message: '身份证号' }]" />
+          <van-field v-model="form.email" name="email" label="电子邮箱" :rules="[{ required: false, message: '电子邮箱' }]" />
+          <van-field v-model="form.address" name="address" label="联系地址" :rules="[{ required: false, message: '联系地址' }]" />
+          <van-field v-model="form.zwzc" name="zwzc" label="职务职称" :rules="[{ required: false, message: '职务职称' }]" />
+          <van-field v-model="form.school" name="school" label="院校" :rules="[{ required: false, message: '院校' }]" />
+          <van-field v-model="form.major" name="major" label="专业" :rules="[{ required: false, message: '专业' }]" />
+          <van-field v-model="form.word_tel" name="word_tel" label="办公电话" :rules="[{ required: false, message: '办公电话' }]" />
           <div style="margin: 16px">
             <van-button round block type="info" native-type="submit">提交</van-button>
           </div>

src/views/test.vue

@@ -12,6 +12,11 @@
         <van-button @click="toNotcie()">查询通知信息</van-button>
         <van-button @click="toView()">查看信息</van-button>
       </van-col>
+      <van-col span="24">
+        <van-button @click="notcieSearch()">通知信息</van-button>
+        <van-button @click="notcieSchSearch()">查询指定学校的用户通知信息</van-button>
+        <van-button @click="notcieSchFilter()">过滤数据</van-button>
+      </van-col>
     </van-row>
   </div>
 </template>
@@ -49,6 +54,10 @@ export default {
       userList2: [],
       // 通知信息
       noticeList: [],
+      // 指定人通知信息
+      notice4List: [],
+      // 工大，工程通知信息
+      notice5List: [],
     };
   },
   created() {
@@ -57,9 +66,18 @@ export default {
   },
   methods: {
     ...statistics(['patentInfoByApplyPerson']),
-    ...personal({ personalQuery: 'query', personalUpdate: 'update', personalDelete: 'delete' }),
+    ...personal({
+      personalQuery: 'query',
+      personalUpdate: 'update',
+      personalDelete: 'delete',
+      personalFetch: 'fetch',
+    }),
     ...patentearly({ patentearlyQuery: 'query' }),
-    ...patentnotice({ patentnoticeQuery: 'query', patentnoticeUpdate: 'update' }),
+    ...patentnotice({
+      patentnoticeQuery: 'query',
+      patentnoticeUpdate: 'update',
+      patentnoticeDelete: 'delete',
+    }),
     // 添加用户
     async toAdd() {
       console.log(this.textname);
@@ -124,7 +142,12 @@ export default {
       let p2 = user.filter((i) => i.phone == i.name);
       this.$set(this, `userList2`, p2);
       for (const val of p1) {
-        let res = await this.patentnoticeQuery({ skip: 0, limit: 10000, to_type: '4', to_id: val._id });
+        let res = await this.patentnoticeQuery({
+          skip: 0,
+          limit: 10000,
+          to_type: '4',
+          to_id: val._id,
+        });
         if (res.errcode == '0' && res.total > 0) {
           notice.push(...res.data);
         }
@@ -155,6 +178,36 @@ export default {
       // }
       // console.log('3');
     },
+    // 查询通知信息
+    async notcieSearch() {
+      let res = await this.patentnoticeQuery({ skip: 0, limit: 1000, to_type: '4' });
+      if (res.errcode == '0') {
+        this.$set(this, `notice4List`, res.data);
+        console.log('1');
+      }
+    },
+    // 指定学校人的通知信息
+    async notcieSchSearch() {
+      let user = [];
+      let p1 = await this.personalQuery({ code: 'CCUT' });
+      let p2 = await this.personalQuery({ code: 'CCIT' });
+      user = [...p1.data, p2.data];
+      this.$set(this, `userList`, user);
+      console.log('2');
+    },
+    // 过滤数据
+    async notcieSchFilter() {
+      for (const val of this.notice4List) {
+        for (const p1 of val.to_id) {
+          let res = await this.personalFetch(p1);
+          if (res.data && res.data._id) {
+          } else {
+            console.log(p1);
+            console.log(val);
+          }
+        }
+      }
+    },
   },
   computed: {
     ...mapState(['user']),