更新

README.md

@@ -35,3 +35,5 @@ http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:
 测试企业-顾红伟
 http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt3AHT4JGsalxnQwicULgjFI
 
+成来电气
+http://free.liaoningdoupo.com/api/auth/wxchattest?redirect_uri=http://localhost:8002/live/index&type=0&openid=o3ORKt0F_bQkB6hWqN7xzNz-OdqI

src/layout/myProduct/release.vue

@@ -2,41 +2,43 @@
   <div id="release">
     <el-row>
       <el-col :span="24" class="info">
-        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form ref="form" :model="form" label-width="100px" :rules="rules">
           <el-form-item label="产品类型" prop="totaltype">
             <el-select v-model="form.totaltype" placeholder="请选择产品类型">
-              <el-option v-for="(item, index) in totaltype_list" :key="index" :value="item.value" :label="item.name"></el-option>
+              <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="name">
-            <el-input v-model="form.name" placeholder="请输入产品名称"></el-input>
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入名称"></el-input>
           </el-form-item>
           <el-form-item label="类型">
             <el-select v-model="form.product_type_id" filterable @change="selectChild">
               <el-option v-for="(item, index) in columnList" :key="index" :value="item.id" :label="item.name"></el-option>
             </el-select>
           </el-form-item>
-          <span v-if="form.totaltype == 0">
-            <el-form-item label="研发阶段">
-              <el-select v-model="form.phase" placeholder="请选择研发阶段">
-                <el-option label="阶段成果" value="1"></el-option>
-                <el-option label="最终成果" value="2"></el-option>
-              </el-select>
-            </el-form-item>
-          </span>
           <el-form-item label="产品简介">
-            <el-input v-model="form.introduction" placeholder="请输入产品简介"></el-input>
+            <el-input type="textarea" v-model="form.introduction" placeholder="请输入产品简介"></el-input>
+          </el-form-item>
+          <el-form-item label="研发阶段" v-if="form.totaltype == null || form.totaltype == '0'">
+            <el-select v-model="form.phase" placeholder="请选择研发阶段">
+              <el-option label="阶段成果" value="0"></el-option>
+              <el-option label="最终成果" value="1"></el-option>
+            </el-select>
           </el-form-item>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="产品单价">
-                <el-input v-model="form.price" placeholder="产品单价"></el-input>
+              <el-form-item label="产品单价" v-if="form.totaltype == null || form.totaltype == '0' || form.totaltype == '1'">
+                <el-input v-model="form.price" placeholder="请输入产品单价"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="产品单位">
-                <el-select v-model="form.priceunit" placeholder="单位">
-                  <el-option v-for="(item, index) in priceunit_list" :key="index" :label="item.name" :value="item.name"></el-option>
+              <el-form-item label="产品单位" v-if="form.totaltype == null || form.totaltype == '0' || form.totaltype == '1'">
+                <el-select v-model="form.priceunit" 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-col>
@@ -52,26 +54,100 @@
               @delete="uploadDelete"
             ></upload>
           </el-form-item>
-          <span v-if="form.totaltype == 0 || form.totaltype == 2">
-            <el-form-item label="应用领域">
-              <el-input v-model="form.field" placeholder="请输入应用领域"></el-input>
+          <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-input type="textarea" v-model="form.scope" placeholder="请输入服务范围"></el-input>
           </el-form-item>
-          <el-form-item label="交易方式">
+          <el-form-item label="合作方式" v-if="form.totaltype == null || form.totaltype == '0' || form.totaltype == '1'">
+            <el-select v-model="form.coopermode" 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>
+          <el-form-item label="交易方式" v-if="form.totaltype == null || form.totaltype == '0' || form.totaltype == '1'">
             <el-select v-model="form.business" 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="投入预算" v-if="form.totaltype == null || form.totaltype == '0'">
+            <el-input v-model="form.budget" placeholder="请输入投入预算"></el-input>
+          </el-form-item>
+          <el-form-item label="需求截止日期" v-if="form.totaltype == null || form.totaltype == '0'">
+            <el-date-picker v-model="form.end_date" type="date" placeholder="请选择需求截止日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item v-if="form.totaltype == null || form.totaltype == '0'">
+            <span slot="label">
+              <el-popover
+                placement="top-start"
+                width="200"
+                trigger="hover"
+                content="（阐述在生产经营、项目建设、科研活动、产业化方向中遇到的技术难题或瓶颈问题及需达到的技术指标）"
+              >
+                <span slot="reference" style="color:#409eff">难题或瓶颈问题</span>
+              </el-popover>
+            </span>
+            <el-input type="textarea" v-model="form.difficult_problem" placeholder="请输入难题或瓶颈问题"></el-input>
+          </el-form-item>
+          <el-form-item v-if="form.totaltype == null || form.totaltype == '0'">
+            <span slot="label">
+              <el-popover
+                placement="top-start"
+                width="200"
+                trigger="hover"
+                content="（企业承接成果、技术所具备的技术人员、设备、资金等基础条件及其他配套条件）"
+              >
+                <span slot="reference" style="color:#409eff">企业解决技术需求已具备的条件</span>
+              </el-popover>
+            </span>
+            <el-input type="textarea" v-model="form.demand" placeholder="请输入企业解决需求"></el-input>
+          </el-form-item>
+          <el-form-item label="企业名称" v-if="form.totaltype == null || form.totaltype == '1'">
+            <el-input v-model="form.company" placeholder="请输入企业名称"></el-input>
+          </el-form-item>
+          <el-form-item label="企业地址" v-if="form.totaltype == null || form.totaltype == '1'">
+            <el-input v-model="form.address" placeholder="请输入企业地址"></el-input>
+          </el-form-item>
+          <el-form-item label="技术团队情况" v-if="form.totaltype == null || form.totaltype == '1'">
+            <el-input type="textarea" v-model="form.team" placeholder="请输入技术团队情况"></el-input>
+          </el-form-item>
+          <el-form-item label="知识产权情况" v-if="form.totaltype == null || form.totaltype == '1'">
+            <el-input v-model="form.property" placeholder="请输入知识产权情况"></el-input>
+          </el-form-item>
+          <el-form-item label="技术成熟度" v-if="form.totaltype == null || form.totaltype == '1'">
+            <el-select v-model="form.mature" 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-select>
+          </el-form-item>
+          <el-form-item label="是否有拟合作企业，如有请填企业名称" v-if="form.totaltype == null || form.totaltype == '1'">
+            <el-input v-model="form.coopercompany" placeholder="请输入是否有拟合作企业，如有请填企业名称"></el-input>
+          </el-form-item>
+          <el-form-item label="其他需求" v-if="form.totaltype == null || form.totaltype == '1'">
+            <el-input v-model="form.other" 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>
           <el-form-item label="联系电话" prop="contact_tel">
-            <el-input v-model="form.contact_tel" placeholder="请输入联系电话"></el-input>
+            <el-input v-model.number="form.contact_tel" placeholder="请输入联系电话" maxlength="11"></el-input>
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="onSubmitDraft">保存草稿</el-button>

src/views/userCenter/matter/parts/intentionList.vue

@@ -43,11 +43,14 @@ export default {
   },
   methods: {
     ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
-    async searchInfo() {
+    async searchInfo({ skip = 0, limit = 1000, ...info } = {}) {
       let market_userid = this.user.uid;
-      let res = await this.transactionList({ market_userid, status: 1 });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
+      skip = this.skip;
+      const res = await this.transactionList({ skip, limit, market_userid, status: 1, ...info });
+      const arr = await this.transactionList({ skip, limit, market_userid, status: 4, ...info });
+      var newData = res.data.concat(arr.data);
+      if (this.$checkRes(newData)) {
+        this.$set(this, `list`, newData);
       }
     },
 

src/views/userCenter/matter/parts/negotiation.vue

@@ -42,9 +42,10 @@ export default {
   },
   methods: {
     ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
-    async searchInfo() {
+    async searchInfo({ skip = 0, limit = 1000, ...info } = {}) {
       let market_userid = this.user.uid;
-      let res = await this.transactionList({ market_userid, status: 0 });
+      skip = this.skip;
+      const res = await this.transactionList({ skip, limit, market_userid, status: 0, ...info });
       if (this.$checkRes(res)) {
         this.$set(this, `list`, res.data);
       }

src/views/userCenter/matter/parts/transaction.vue

@@ -41,11 +41,15 @@ export default {
   },
   methods: {
     ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
-    async searchInfo() {
+    async searchInfo({ skip = 0, limit = 1000, ...info } = {}) {
       let market_userid = this.user.uid;
-      let res = await this.transactionList({ market_userid, status: 2 });
+      let userid = this.user.uid;
+      skip = this.skip;
+      const res = await this.transactionList({ skip, limit, market_userid, status: 2, ...info });
+      const arr = await this.transactionList({ skip, limit, userid, status: 2, ...info });
+      var newData = res.data.concat(arr.data);
       if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
+        this.$set(this, `list`, newData);
       }
     },
 

src/views/userCenter/matter/parts/wholeList.vue

@@ -40,11 +40,14 @@ export default {
   },
   methods: {
     ...transaction({ transactionList: 'query', transactiondtetle: 'delete', shenheupdate: 'update' }),
-    async searchInfo() {
+    async searchInfo({ skip = 0, limit = 1000, ...info } = {}) {
+      let userid = this.user.uid;
       let market_userid = this.user.uid;
-      let res = await this.transactionList({ market_userid });
-      if (this.$checkRes(res)) {
-        this.$set(this, `list`, res.data);
+      const res = await this.transactionList({ skip, limit, userid, ...info });
+      const arr = await this.transactionList({ skip, limit, market_userid, ...info });
+      var newData = res.data.concat(arr.data);
+      if (this.$checkRes(newData)) {
+        this.$set(this, `list`, newData);
       }
     },
 

src/views/userCenter/myProduct/parts/auditList.vue

@@ -40,7 +40,7 @@ export default {
   },
   methods: {
     ...mapMarketproduct({ productList: 'query', columnInfo: 'fetch', marketcerate: 'create', productdeltet: 'delete', upup: 'update' }),
-    async searchInfo({ skip = 0, limit = 10, ...info } = {}) {
+    async searchInfo({ skip = 0, limit = 1000, ...info } = {}) {
       let userid = this.user.uid;
       const res = await this.productList({ skip, limit, status: 1, userid, ...info });
       if (this.$checkRes(res)) {

src/views/userCenter/myProduct/parts/caogaoList.vue

@@ -48,7 +48,7 @@ export default {
   },
   methods: {
     ...mapMarketproduct({ productList: 'query', columnInfo: 'fetch', marketcerate: 'create', productdeltet: 'delete', upup: 'update' }),
-    async searchInfo({ skip = 0, limit = 10, ...info } = {}) {
+    async searchInfo({ skip = 0, limit = 1000, ...info } = {}) {
       let userid = this.user.uid;
       const res = await this.productList({ skip, limit, status: 2, userid, ...info });
       const resTwo = await this.productList({ skip, limit, status: 3, userid, ...info });

src/views/userCenter/myProduct/parts/noauditList.vue

@@ -40,7 +40,7 @@ export default {
   },
   methods: {
     ...mapMarketproduct({ productList: 'query', columnInfo: 'fetch', marketcerate: 'create', productdeltet: 'delete', upup: 'update' }),
-    async searchInfo({ skip = 0, limit = 10, ...info } = {}) {
+    async searchInfo({ skip = 0, limit = 1000, ...info } = {}) {
       let userid = this.user.uid;
       const res = await this.productList({ skip, limit, status: 0, userid, ...info });
       if (this.$checkRes(res)) {