rjy il y a 4 ans
Parent
commit
ab3ec9cf48

+ 46 - 14
src/views/superAdminCenter/notice/index.vue

@@ -8,14 +8,13 @@
         <data-table :fields="fields" :opera="opera" @edit="toEdit" :data="list" :total="total" @delete="toDelete" @query="search"></data-table>
       </el-col>
       <el-dialog :title="theme" width="60%" :visible.sync="dialog" @closed="handleClose" :destroy-on-close="true">
-        <el-form ref="form" :rules="rules" :model="form" label-width="80px">
+        <el-form ref="form" :rules="rules" :model="form" label-width="100px">
           <el-form-item label="标题" prop="title">
             <el-input v-model="form.title" placeholder="请输入信息标题"></el-input>
           </el-form-item>
           <el-form-item label="来源">
             <el-input v-model="form.source" placeholder="请输入信息来源"></el-input>
           </el-form-item>
-
           <el-form-item label="信息内容">
             <wang-editor v-model="form.content" placeholder="请输入信息内容"></wang-editor>
           </el-form-item>
@@ -24,6 +23,12 @@
               <el-date-picker type="date" placeholder="发布时间" value-format="yyyy-MM-dd" v-model="form.create_time" style="width: 100%;"></el-date-picker>
             </el-col>
           </el-form-item>
+          <el-form-item label="是否启用">
+            <el-radio-group v-model="form.isenable">
+              <el-radio label="1">启用</el-radio>
+              <el-radio label="2">禁用</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="onSubmit()">提交</el-button>
           </el-form-item>
@@ -38,6 +43,7 @@ import { mapState, createNamespacedHelpers } from 'vuex';
 import WangEditor from '@/components/wang-editor.vue';
 import upload from '@/components/upload.vue';
 import dataTable from '@/components/data-table.vue';
+const { mapActions: notice } = createNamespacedHelpers('notice');
 export default {
   name: 'index',
   props: {},
@@ -69,18 +75,11 @@ export default {
           label: '是否启用',
           prop: 'isenable',
           format: item => {
-            return item === '0' ? '未启用' : item === '1' ? '启用' : '未识别';
+            return item === '0' ? '未启用' : item === '1' ? '启用' : '禁用';
           },
         },
       ],
-      list: [
-        {
-          title: 'ddd',
-          source: 'sd',
-          create_time: 'ssss',
-          isenable: '0',
-        },
-      ],
+      list: [],
       total: 0,
       dialog: false,
       // 添加信息
@@ -92,19 +91,52 @@ export default {
     this.search();
   },
   methods: {
-    async search({ skip = 0, limit = 10, ...info } = {}) {},
+    ...notice(['query', 'fetch', 'update', 'create', 'delete']),
+    async search({ skip = 0, limit = 10, ...info } = {}) {
+      let arr = await this.query({ skip, limit, ...info });
+      this.$set(this, `list`, arr.data);
+      this.$set(this, `total`, arr.total);
+    },
     toEdit({ data }) {
       this.dialog = true;
       this.$set(this, `form`, data);
     },
-    async toDelete({ data }) {},
+    async toDelete({ data }) {
+      let res = await this.delete(data.id);
+      this.$message({
+        message: '刪除信息成功',
+        type: 'success',
+      });
+      this.search();
+    },
     // 添加
     toAdd() {
       this.dialog = true;
       this.form = {};
     },
     // 提交
-    async onSubmit() {},
+    async onSubmit() {
+      if (this.form.id) {
+        let res = await this.update(this.form);
+        if (this.$checkRes(res)) {
+          this.$message({
+            message: '修改信息成功',
+            type: 'success',
+          });
+          this.handleClose();
+        }
+      } else {
+        let res = await this.create(this.form);
+        if (this.$checkRes(res)) {
+          this.$message({
+            message: '添加信息成功',
+            type: 'success',
+          });
+          this.handleClose();
+        }
+      }
+      this.search();
+    },
     // 取消
     handleClose() {
       this.form = {};

+ 191 - 120
src/views/superAdminCenter/productSolicit/index.vue

@@ -16,71 +16,64 @@
           </el-tabs>
         </el-col>
         <el-dialog width="60%" :visible.sync="dialog" @closed="handleClose" :destroy-on-close="true">
-          <el-form ref="form" :model="form" label-width="130px" :rules="rules">
-            <el-form-item label="审核信息状态" v-if="form.id">
-              <el-radio v-model="form.status" label="0" disabled>待审核</el-radio>
-              <el-radio v-model="form.status" label="1">审核通过</el-radio>
-              <el-radio v-model="form.status" label="2">审核拒绝</el-radio>
-            </el-form-item>
-            <el-form-item label="产品类型" prop="type">
+          <el-form ref="form" :model="form" label-width="140px" :rules="rules">
+            <el-form-item label="产品类型" prop="totaltype">
               <el-select v-model="form.type" placeholder="请选择产品类型">
                 <el-option label="技术" value="0"></el-option>
                 <el-option label="产品" value="1"></el-option>
                 <el-option label="服务" value="2"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="创建人" prop="uesrid">
-              <el-input v-model="form.uesrid" placeholder="请输入创建人"></el-input>
-            </el-form-item>
-            <el-form-item label="名称" prop="name">
+            <el-form-item label="名称">
               <el-input v-model="form.name" placeholder="请输入名称"></el-input>
             </el-form-item>
-            <el-form-item label="所属机构代码" prop="code">
-              <el-input v-model="form.code" placeholder="请输入所属机构代码"></el-input>
+            <el-form-item label="所属领域">
+              <el-select v-model="form.field" filterable>
+                <el-option v-for="(item, index) in fieldList" :key="index" :value="item.name" :label="item.name"></el-option>
+              </el-select>
             </el-form-item>
-            <span>
-              <el-form-item label="所属领域">
-                <el-select v-model="form.field" placeholder="请选择所属领域">
-                  <el-option label="先进制造" value="0"></el-option>
-                  <el-option label="新材料" value="1"></el-option>
-                  <el-option label="光电子" value="2"></el-option>
-                  <el-option label="信息技术" value="3"></el-option>
-                  <el-option label="文化和科技融合" value="4"></el-option>
-                </el-select>
-              </el-form-item>
-            </span>
             <el-form-item label="合作方式">
-              <el-select v-model="form.cooperation" placeholder="请选择合作方式">
-                <el-option label="技术转让" value="0"></el-option>
-                <el-option label="技术服务" value="1"></el-option>
-                <el-option label="技术许可" value="2"></el-option>
-                <el-option label="技术融资" value="3"></el-option>
-                <el-option label="其他" value="4"></el-option>
+              <el-select v-model="form.cooperation" filterable>
+                <el-option v-for="(item, index) in cooperationList" :key="index" :value="item.name" :label="item.name"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item label="企业名称">
               <el-input v-model="form.company" placeholder="请输入企业名称"></el-input>
             </el-form-item>
-            <el-form-item label="企业简介" prop="companybrief" type="textarea">
-              <el-input v-model="form.companybrief" placeholder="请输入名称"></el-input>
+            <el-form-item label="企业简介">
+              <el-input
+                v-model="form.companybrief"
+                type="textarea"
+                maxlength="300"
+                show-word-limit
+                :autosize="{ minRows: 2, maxRows: 5 }"
+                placeholder="请输入企业简介"
+              ></el-input>
             </el-form-item>
-            <el-form-item label="企业网站" prop="companyweb">
-              <el-input v-model="form.companyweb" placeholder="请输入名称"></el-input>
+            <el-form-item label="企业网站">
+              <el-input v-model="form.companyweb" placeholder="请输入企业网站"></el-input>
             </el-form-item>
-            <el-form-item label="联系人" prop="contact_user">
-              <el-input v-model="form.contact_user" placeholder="请输入联系人"></el-input>
+            <el-form-item label="联系人">
+              <el-input v-model="form.contacts" placeholder="请输入联系人"></el-input>
             </el-form-item>
-            <el-form-item label="联系电话" prop="contact_tel">
-              <el-input v-model.number="form.contact_tel" placeholder="请输入联系电话" maxlength="11"></el-input>
+            <el-form-item label="联系电话">
+              <el-input v-model="form.phone" placeholder="请输入联系电话"></el-input>
             </el-form-item>
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email"></el-input>
+            <el-form-item label="QQ&微信">
+              <el-input v-model="form.qqwx" placeholder="请输入QQ&微信"></el-input>
             </el-form-item>
-            <el-form-item label="qq&微信" prop="qqwx">
-              <el-input v-model="form.qqwx"></el-input>
+            <el-form-item label="电子邮箱">
+              <el-input v-model="form.email" placeholder="请输入电子邮箱"></el-input>
             </el-form-item>
-            <el-form-item label="合作条件及要求" prop="condition">
-              <el-input v-model="form.condition"></el-input>
+            <el-form-item label="合作条件及要求">
+              <el-input
+                v-model="form.condition"
+                type="textarea"
+                maxlength="300"
+                show-word-limit
+                :autosize="{ minRows: 2, maxRows: 5 }"
+                placeholder="请输入合作条件及要求"
+              ></el-input>
             </el-form-item>
             <el-form-item label="产品图片" prop="image">
               <upload
@@ -93,19 +86,8 @@
                 @delete="uploadDelete"
               ></upload>
             </el-form-item>
-            <span v-if="form.type == null || form.type == '0'">
-              <el-form-item label="需求紧急程度">
-                <el-input v-model="form.degreeurgency" placeholder="请输入需求紧急程度"></el-input>
-              </el-form-item>
-              <el-form-item label="及时难题&需求说明">
-                <el-input type="textarea" v-model="form.requirementdesc" placeholder="请输入及时难题&需求说明"></el-input>
-              </el-form-item>
-              <el-form-item label="预期技术目标描述">
-                <el-input type="textarea" v-model="form.expect" placeholder="请输入预期技术目标描述"></el-input>
-              </el-form-item>
-              <el-form-item label="需求现状及应对措施">
-                <el-input type="textarea" v-model="form.present" placeholder="请输入需求现状及应对措施"></el-input>
-              </el-form-item>
+            <!-- 技术 -->
+            <span v-if="form.type == '0'">
               <el-form-item label="投资预算">
                 <el-input v-model="form.budget" placeholder="请输入投资预算"></el-input>
               </el-form-item>
@@ -116,7 +98,7 @@
                 <el-input v-model="form.zzjgdm" placeholder="请输入组织机构代码"></el-input>
               </el-form-item>
               <el-form-item label="注册时间">
-                <el-date-picker type="date" placeholder="注册时间" value-format="yyyy-MM-dd" v-model="form.companydate" style="width: 100%;"></el-date-picker>
+                <el-date-picker v-model="form.companydate" type="date" placeholder="请选择时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd"> </el-date-picker>
               </el-form-item>
               <el-form-item label="注册资金">
                 <el-input v-model="form.companycapital" placeholder="请输入注册资金"></el-input>
@@ -136,47 +118,141 @@
               <el-form-item label="专&兼职研发人数">
                 <el-input v-model="form.zjzyfrs" placeholder="请输入专&兼职研发人数"></el-input>
               </el-form-item>
-              <el-form-item label="主要产品">
-                <el-input type="textarea" v-model="form.mainproduct" placeholder="请输入主要产品"></el-input>
+              <el-form-item label="需求紧急程度">
+                <el-radio-group v-model="form.degreeurgency">
+                  <el-radio label="特急"></el-radio>
+                  <el-radio label="一般"></el-radio>
+                  <el-radio label="储备"></el-radio>
+                </el-radio-group>
               </el-form-item>
-              <el-form-item label="企业资质&荣誉">
-                <el-input type="textarea" v-model="form.qualifications" placeholder="请输入企业资质&荣誉"></el-input>
+              <el-form-item label="技术难题&需求说明">
+                <el-input
+                  v-model="form.requirementdesc"
+                  type="textarea"
+                  maxlength="500"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入技术难题&需求说明"
+                ></el-input>
               </el-form-item>
-            </span>
-            <span v-if="form.type == null || form.type == '1'">
-              <el-form-item label="成果简介">
-                <el-input type="textarea" v-model="form.achievebrief" placeholder="请输入成果简介"></el-input>
+              <el-form-item label="预期技术目标描述">
+                <el-input
+                  v-model="form.expect"
+                  type="textarea"
+                  maxlength="300"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入预期技术目标描述"
+                ></el-input>
               </el-form-item>
-              <el-form-item label="技术特点">
-                <el-input type="textarea" v-model="form.features" placeholder="请输入技术特点"></el-input>
+              <el-form-item label="需求现状及应对措施">
+                <el-input
+                  v-model="form.present"
+                  type="textarea"
+                  maxlength="300"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入需求现状及应对措施"
+                ></el-input>
               </el-form-item>
-              <el-form-item label="技术团队">
-                <el-input type="textarea" v-model="form.team" placeholder="请输入技术团队"></el-input>
+              <el-form-item label="主要产品">
+                <el-input
+                  v-model="form.mainproduct"
+                  type="textarea"
+                  maxlength="300"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入主要产品"
+                ></el-input>
               </el-form-item>
+              <el-form-item label="企业资质&荣誉">
+                <el-input
+                  v-model="form.qualifications"
+                  type="textarea"
+                  maxlength="300"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入企业资质&荣誉"
+                ></el-input>
+              </el-form-item>
+            </span>
+            <!-- 产品 -->
+            <span v-else-if="form.type == '1'">
               <el-form-item label="成果状态">
-                <el-input v-model="form.achievestatus" placeholder="请输入成果状态"></el-input>
+                <el-select v-model="form.achievestatus" filterable>
+                  <el-option v-for="(item, index) in achievestatusList" :key="index" :value="item.name" :label="item.name"></el-option>
+                </el-select>
               </el-form-item>
               <el-form-item label="成果权属">
                 <el-input v-model="form.achieveown" placeholder="请输入成果权属"></el-input>
               </el-form-item>
               <el-form-item label="成果来源">
-                <el-input v-model="form.achievesource" placeholder="请输入成果来源"></el-input>
+                <el-radio-group v-model="form.degreeurgency">
+                  <el-radio label="国家项目"></el-radio>
+                  <el-radio label="省级项目"></el-radio>
+                  <el-radio label="市级项目"></el-radio>
+                  <el-radio label="自选项目"></el-radio>
+                </el-radio-group>
               </el-form-item>
               <el-form-item label="专利信息">
                 <el-input v-model="form.patentinfo" placeholder="请输入专利信息"></el-input>
               </el-form-item>
               <el-form-item label="专利状态">
-                <el-input v-model="form.patentstatus" placeholder="请输入专利状态"></el-input>
-              </el-form-item>
-              <el-form-item label="商业预期">
-                <el-input type="textarea" v-model="form.expectations" placeholder="请输入商业预期"></el-input>
+                <el-radio-group v-model="form.patentstatus">
+                  <el-radio label="已申请"></el-radio>
+                  <el-radio label="已授权"></el-radio>
+                </el-radio-group>
               </el-form-item>
               <el-form-item label="项目路演">
-                <el-input type="textarea" v-model="form.roadshow" placeholder="请输入项目路演"></el-input>
+                <el-input v-model="form.roadshow" placeholder="请输入项目路演"></el-input>
               </el-form-item>
               <el-form-item label="意向价格">
-                <el-input type="textarea" v-model="form.intentionprice" placeholder="请输入意向价格"></el-input>
+                <el-input v-model="form.intentionprice" placeholder="请输入意向价格"></el-input>
+              </el-form-item>
+              <el-form-item label="成果简介">
+                <el-input
+                  v-model="form.achievebrief"
+                  type="textarea"
+                  maxlength="200"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入成果简介"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="技术特点">
+                <el-input
+                  v-model="form.features"
+                  type="textarea"
+                  maxlength="200"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入技术特点"
+                ></el-input>
               </el-form-item>
+              <el-form-item label="技术团队">
+                <el-input
+                  v-model="form.team"
+                  type="textarea"
+                  maxlength="300"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入技术团队"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="商业预期">
+                <el-input
+                  v-model="form.expectations"
+                  type="textarea"
+                  maxlength="300"
+                  show-word-limit
+                  :autosize="{ minRows: 2, maxRows: 5 }"
+                  placeholder="请输入商业预期"
+                ></el-input>
+              </el-form-item>
+            </span>
+            <!-- 服务 -->
+            <span v-else-if="form.type == '2'">
+              服务
             </span>
             <el-form-item>
               <el-button type="primary" @click="examineBtn()">审核提交</el-button>
@@ -194,6 +270,7 @@ import two from './parts/two.vue';
 import three from './parts/three.vue';
 import upload from '@/components/uploadProduct.vue';
 import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: markettype } = createNamespacedHelpers('markettype');
 export default {
   name: 'index',
   props: {},
@@ -201,19 +278,12 @@ export default {
     one,
     two,
     three,
-    upload,
+    // upload,
   },
   data: function() {
     return {
       activeName: 'first',
-      oneList: [
-        {
-          name: 'ds',
-          type: '0',
-          field: '1',
-          status: '1',
-        },
-      ],
+      oneList: [],
       oneTotal: 0,
       twoList: [],
       twoTotal: 0,
@@ -221,28 +291,44 @@ export default {
       threeTotal: 0,
       dialog: false,
       form: {},
-      rules: {},
-      columnList: [],
-      exportList: [],
+      // 验证
+      rules: {
+        name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
+      },
+      // 所属领域
+      fieldList: [],
+      // 成果状态
+      achievestatusList: [],
+      // 合作方式
+      cooperationList: [],
     };
   },
-  created() {},
+  created() {
+    this.searchtype();
+    this.search();
+  },
   methods: {
-    // 查询列表
-    async search({ skip = 0, limit = 10, ...info } = {}) {
-      let code = this.user.code;
-      let pid = this.user.uid;
-      const oneArr = await this.comquery({ status: 0, code, pid, skip, limit, ...info });
-      const twoArr = await this.comquery({ status: 1, code, pid, skip, limit, ...info });
-      const threeArr = await this.comquery({ status: 2, code, pid, skip, limit, ...info });
-      this.$set(this, `oneList`, oneArr.data);
-      this.$set(this, `oneTotal`, oneArr.data.length);
-      this.$set(this, `twoList`, twoArr.data);
-      this.$set(this, `exportList`, twoArr.data);
-      this.$set(this, `twoTotal`, twoArr.data.length);
-      this.$set(this, `threeList`, threeArr.data);
-      this.$set(this, `threeTotal`, threeArr.data.length);
+    ...markettype({ markettypeList: 'query' }),
+    // 查询字典表
+    async searchtype() {
+      // 所属领域;
+      let res = await this.markettypeList({ category: '01' });
+      if (this.$checkRes(res)) {
+        this.$set(this, `fieldList`, res.data);
+      }
+      // 成果状态;
+      res = await this.markettypeList({ category: '02' });
+      if (this.$checkRes(res)) {
+        this.$set(this, `achievestatusList`, res.data);
+      }
+      // 合作方式;
+      res = await this.markettypeList({ category: '03' });
+      if (this.$checkRes(res)) {
+        this.$set(this, `cooperationList`, res.data);
+      }
     },
+    // 查询列表
+    async search({ skip = 0, limit = 10, ...info } = {}) {},
     // 审核
     handleEdit(data) {
       this.$set(this, `form`, data);
@@ -276,21 +362,6 @@ export default {
         this.search();
       }
     },
-    // 查询类型
-    async maarkettype({ category = 54, ...info } = {}) {
-      const res = await this.markettypeList({ category, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `columnList`, res.data);
-      }
-    },
-    // 类型选择
-    selectChild(product_type_id) {
-      let res = this.columnList.filter(fil => fil.id === product_type_id);
-      if (res.length > 0) {
-        this.$set(this.form, `product_type_name`, res[0].name);
-      }
-      this.$forceUpdate();
-    },
     // 图片
     uploadSuccess({ type, data }) {
       let arr = _.get(this.form, type);

+ 0 - 1
src/views/userCenter/productInfo/part/infoRelease.vue

@@ -264,7 +264,6 @@ export default {
   name: 'infoRelease',
   props: {
     form: null,
-    product_args: null,
   },
   components: {
     upload,