guhongwei 3 年之前
父節點
當前提交
5ce4279415

+ 3 - 3
src/layout/chatCommon/chat.vue

@@ -124,8 +124,8 @@ export default {
     // 提交发送
     async twoSend() {
       let data = this.fileForm;
-      if (data.file) {
-        let data = {
+      if (data.file.length > 0) {
+        let arr = {
           type: '2',
           file: data.file,
           sender_id: this.user._id,
@@ -133,7 +133,7 @@ export default {
           receiver_id: this.adminInfo._id,
           receiver_name: this.adminInfo.name,
         };
-        let res = await this.create(data);
+        let res = await this.create(arr);
         if (this.$checkRes(res)) {
           this.$toast({ type: `success`, message: `发言成功` });
           this.fileForm = { file: [] };

+ 1 - 1
src/views/account/adminCenter/mechanism/parts/detail_1.vue

@@ -9,7 +9,7 @@
             <van-picker show-toolbar :columns="pidList" value-key="name" @confirm="pidCon" @cancel="showPicker = false" />
           </van-popup>
           <van-field v-model="form.code" name="code" label="机构代码或邀请码" :rules="[{ required: true, message: '机构代码或邀请码' }]" />
-          <van-field v-model="form.deptname" name="deptname" label="机构代码" :rules="[{ required: true, message: '机构代码' }]" />
+          <van-field v-model="form.deptname" name="deptname" 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.passwd" name="passwd" label="密码" type="password" :rules="[{ required: true, message: '密码' }]" />

+ 1 - 1
src/views/patent/admin/examine/hairmess_autoCreate.vue

@@ -60,7 +60,7 @@ export default {
       let data = { uri: this.uri };
       let res = await this.import(data);
       if (this.$checkRes(res)) {
-        if (res.data) this.$set(this, `list`, res.data);
+        if (!res.data == 'ok') this.$set(this, `list`, res.data);
         this.$toast({ type: `success`, message: `操作成功` });
       } else {
         this.$toast({ type: `success`, message: `${res.errmsg}` });

+ 1 - 1
src/views/patent/admin/message/parts/list-1.vue

@@ -40,7 +40,7 @@ export default {
       } else {
         this.$set(this, `otherInfo`, { sender_id: data.sender_id, sender_name: data.sender_name });
       }
-      this.$router.push({ path: '/service/patent/admin/message/service_detail', query: { ...this.otherInfo } });
+      this.$router.push({ path: '/patent/admin/message/service_detail', query: { ...this.otherInfo } });
     },
     // 整理名称
     getName(data) {

+ 8 - 14
src/views/patent/user/apply/analysis/parts/detail-2.vue

@@ -3,22 +3,16 @@
     <van-row>
       <van-col span="24" class="main">
         <van-form @submit="onSubmit">
-          <van-field v-model="form.name" name="发明名称" label="发明名称" placeholder="发明名称" :rules="[{ required: false, message: '发明名称' }]" />
-          <van-field v-model="form.apply_name" name="申请人" label="申请人" placeholder="申请人" :rules="[{ required: false, message: '申请人' }]" />
+          <van-field v-model="form.name" name="name" label="发明名称" placeholder="发明名称" :rules="[{ required: true, message: '发明名称' }]" />
+          <van-field v-model="form.apply_name" name="apply_name" label="申请人" placeholder="申请人" :rules="[{ required: true, message: '申请人' }]" />
           <van-field readonly clickable name="type" :value="form.type" label="选择类型" placeholder="点击选择" @click="typePicker = true" />
           <van-popup v-model="typePicker" position="bottom">
             <van-picker show-toolbar :columns="typeList" @confirm="typeCon" @cancel="typePicker = false" />
           </van-popup>
-          <van-field v-model="form.inventor" name="发明人" label="发明人" placeholder="发明人" :rules="[{ required: false, message: '发明人' }]" />
-          <van-field
-            v-model="form.contact"
-            name="技术联系人"
-            label="技术联系人"
-            placeholder="技术联系人"
-            :rules="[{ required: false, message: '技术联系人' }]"
-          />
-          <van-field v-model="form.phone" name="联系人电话" label="联系人电话" placeholder="联系人电话" :rules="[{ required: false, message: '联系人电话' }]" />
-          <van-field v-model="form.email" name="联系人邮箱" label="联系人邮箱" placeholder="联系人邮箱" :rules="[{ required: false, message: '联系人邮箱' }]" />
+          <van-field v-model="form.inventor" name="inventor" label="发明人" placeholder="发明人" :rules="[{ required: true, message: '发明人' }]" />
+          <van-field v-model="form.contact" name="contact" label="技术联系人" placeholder="技术联系人" :rules="[{ required: true, message: '技术联系人' }]" />
+          <van-field v-model="form.phone" name="phone" label="联系人电话" placeholder="联系人电话" :rules="[{ required: true, message: '联系人电话' }]" />
+          <van-field v-model="form.email" name="email" label="联系人邮箱" placeholder="联系人邮箱" :rules="[{ required: true, message: '联系人邮箱' }]" />
           <van-field
             v-model="form.questions.q8"
             type="textarea"
@@ -143,8 +137,8 @@ export default {
         }
       }
     },
-    onSubmit() {
-      this.$emit('onSubmit', { data: this.form });
+    onSubmit(value) {
+      if (value) this.$emit('onSubmit', { data: this.form });
     },
     // 选择类型
     typeCon(value) {

+ 1 - 1
src/views/patent/user/apply/analysis/parts/list-2.vue

@@ -53,7 +53,7 @@ export default {
     downFile(data) {
       if (data.length > 0) {
         let url = data.map((i) => i.url);
-        window.location.href = `${process.env.VUE_APP_HOST}/${url[0]}`;
+        window.location.href = `${process.env.VUE_APP_HOST}${url[0]}`;
       } else {
         this.$toast({ type: `fail`, message: `非正常文件,无法下载` });
       }

+ 8 - 9
src/views/patent/user/apply/apply/parts/detail-1.vue

@@ -2,7 +2,7 @@
   <div id="detail-1">
     <van-row>
       <van-col span="24" class="main">
-        <van-form>
+        <van-form @submit="onSubmit">
           <van-col :span="24" class="remark">用户申请专利如需所在学校机构进行审核,请选择是;如不需要请选择否;</van-col>
           <van-field name="is_mech" label="是否需要机构" :rules="[{ required: false, message: '请选择' }]">
             <template #input>
@@ -25,9 +25,8 @@
           <van-popup v-model="showPicker" position="bottom">
             <van-picker show-toolbar :columns="mechanismList" value-key="deptname" @confirm="mechanismCon" @cancel="showPicker = false" />
           </van-popup>
-          <!-- <van-field v-model="form.water_number" name="专利用户码" label="专利用户码" readonly /> -->
-          <van-field v-model="form.name" name="专利名称" label="专利名称" placeholder="专利名称" :rules="[{ required: false, message: '专利名称' }]" />
-          <van-field v-model="form.apply_name" name="申请人" label="申请人" placeholder="申请人" :rules="[{ required: false, message: '申请人' }]" />
+          <van-field v-model="form.name" name="name" label="专利名称" placeholder="专利名称" :rules="[{ required: true, message: '专利名称' }]" />
+          <van-field v-model="form.apply_name" name="apply_name" label="申请人" placeholder="申请人" :rules="[{ required: true, message: '申请人' }]" />
           <van-field readonly clickable name="type" :value="form.type" label="选择类型" placeholder="点击选择" @click="typePicker = true" />
           <van-popup v-model="typePicker" position="bottom">
             <van-picker show-toolbar :columns="typeList" @confirm="typeCon" @cancel="typePicker = false" />
@@ -56,8 +55,8 @@
               </span>
             </van-col>
           </van-col>
-          <van-field v-model="form.phone" name="联系人电话" label="联系人电话" placeholder="联系人电话" :rules="[{ required: false, message: '联系人电话' }]" />
-          <van-field v-model="form.email" name="联系人邮箱" label="联系人邮箱" placeholder="联系人邮箱" :rules="[{ required: false, message: '联系人邮箱' }]" />
+          <van-field v-model="form.phone" name="phone" label="联系人电话" placeholder="联系人电话" :rules="[{ required: true, message: '联系人电话' }]" />
+          <van-field v-model="form.email" name="email" label="联系人邮箱" placeholder="联系人邮箱" :rules="[{ required: true, message: '联系人邮箱' }]" />
           <van-field
             v-model="form.questions.q8"
             type="textarea"
@@ -150,7 +149,7 @@
             </template>
           </van-field>
           <div style="margin: 16px">
-            <van-button round block type="info" @click="onSubmit">提交</van-button>
+            <van-button round block type="info" native-type="submit">提交</van-button>
           </div>
         </van-form>
       </van-col>
@@ -253,8 +252,8 @@ export default {
         }
       }
     },
-    onSubmit() {
-      this.$emit('onSubmit', { data: this.form });
+    onSubmit(value) {
+      if (value) this.$emit('onSubmit', { data: this.form });
     },
     // 选择机构
     mechanismCon(value) {