11

src/layout/enterprise/contextedit.vue

@@ -369,9 +369,9 @@ export default {
     selectlistRow: [],
     rowNum: 1,
     totaltype_list: [
-      { name: '技术', value: '0' },
-      { name: '产品', value: '1' },
-      { name: '服务', value: '2' },
+      { name: '科技需求', value: '0' },
+      { name: '技术成果', value: '1' },
+      { name: '商务服务', value: '2' },
     ],
   }),
   created() {},

src/layout/enterprise/contextfabu.vue

@@ -8,9 +8,9 @@
               <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-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="名称">

src/layout/enterprise/contextfabuxx.vue

@@ -26,7 +26,11 @@
                         </el-col>
                         <el-col :span="6" class="fbListCenterC">
                           <p class="textOver">产品：{{ item.name }}</p>
-                          <p>类别：{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : 'underdind' }}</p>
+                          <p>
+                            类别：{{
+                              item.totaltype === '0' ? '科技需求' : item.totaltype === '1' ? '技术成果' : item.totaltype === '2' ? '商务服务' : 'underdind'
+                            }}
+                          </p>
                           <p class="listMoney">{{ item.price }}/{{ item.priceunit }}</p>
                         </el-col>
                         <el-col :span="6" class="fbListCenterTwo">
@@ -76,7 +80,11 @@
                         </el-col>
                         <el-col :span="6" class="fbListCenterC">
                           <p class="textOver">产品：{{ item.name }}</p>
-                          <p>类别：{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : 'underdind' }}</p>
+                          <p>
+                            类别：{{
+                              item.totaltype === '0' ? '科技需求' : item.totaltype === '1' ? '技术成果' : item.totaltype === '2' ? '商务服务' : 'underdind'
+                            }}
+                          </p>
                           <p class="listMoney">{{ item.price }}/{{ item.priceunit }}</p>
                         </el-col>
                         <el-col :span="6" class="fbListCenterTwo">
@@ -126,7 +134,11 @@
                         </el-col>
                         <el-col :span="6" class="fbListCenterC">
                           <p class="textOver">产品：{{ item.name }}</p>
-                          <p>类别：{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : 'underdind' }}</p>
+                          <p>
+                            类别：{{
+                              item.totaltype === '0' ? '科技需求' : item.totaltype === '1' ? '技术成果' : item.totaltype === '2' ? '商务服务' : 'underdind'
+                            }}
+                          </p>
                           <p class="listMoney">{{ item.price }}/{{ item.priceunit }}</p>
                         </el-col>
                         <el-col :span="6" class="fbListCenterTwo">

src/layout/supermarket/detali.vue

@@ -20,7 +20,9 @@
             <p>{{ policyInfo.name }}</p>
             <p class="infoType">
               <span>总分类：</span
-              ><span>{{ policyInfo.totaltype === '0' ? '技术' : policyInfo.totaltype === '1' ? '产品' : policyInfo.totaltype === '2' ? '服务' : '暂无' }}</span>
+              ><span>{{
+                policyInfo.totaltype === '0' ? '科技需求' : policyInfo.totaltype === '1' ? '技术成果' : policyInfo.totaltype === '2' ? '商务服务' : '暂无'
+              }}</span>
               <span>类型名称：</span>
               <span>{{ policyInfo.product_type_name || '暂无' }}</span>
             </p>

src/views/adminCenter/applyInfo/index copy.vue

@@ -50,7 +50,9 @@
         <el-table-column prop="name" label="产品名称" align="center"> </el-table-column>
         <el-table-column label="产品类别" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.totaltype == '0' ? '技术' : scope.row.totaltype == '1' ? '产品' : scope.row.totaltype == '2' ? '服务' : '未识别' }}</span>
+            <span>{{
+              scope.row.totaltype == '0' ? '科技需求' : scope.row.totaltype == '1' ? '技术成果' : scope.row.totaltype == '2' ? '商务服务' : '未识别'
+            }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="contact_user" label="联系人" align="center"> </el-table-column>

src/views/adminCenter/applyInfo/index.vue

@@ -45,7 +45,7 @@
                 <el-table-column prop="name" label="产品名称" align="center" show-overflow-tooltip> </el-table-column>
                 <el-table-column label="类型" align="center">
                   <template slot-scope="scope">
-                    <span>{{ scope.row.type == '0' ? '技术' : scope.row.type == '1' ? '产品' : '商务' }}</span>
+                    <span>{{ scope.row.type == '0' ? '科技需求' : scope.row.type == '1' ? '技术成果' : '商务服务' }}</span>
                   </template>
                 </el-table-column>
                 <el-table-column prop="contacts" label="联系人" align="center" show-overflow-tooltip> </el-table-column>
@@ -87,16 +87,16 @@
         </el-form-item>
         <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-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="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-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="名称">

src/views/dynamic/parts/down-pie.vue

@@ -10,7 +10,7 @@
             <el-table-column prop="name" label="产品名称" align="center" show-overflow-tooltip> </el-table-column>
             <el-table-column label="产品类型" align="center">
               <template slot-scope="scoped">
-                {{ scoped.row.type === '0' ? '技术' : scoped.row.type === '1' ? '产品' : scoped.row.type === '2' ? '服务' : '暂无' }}
+                {{ scoped.row.type === '0' ? '科技需求' : scoped.row.type === '1' ? '技术成果' : scoped.row.type === '2' ? '商务服务' : '暂无' }}
               </template>
             </el-table-column>
             <el-table-column prop="field" label="所属领域" align="center" show-overflow-tooltip> </el-table-column>

src/views/hall/direct.vue

@@ -173,7 +173,7 @@
                           <el-button
                             type="primary"
                             size="mini"
-                            @click="$router.push({ path: '/hall/productList/technologyList', query: { column_name: '产品', dockid: dock_id } })"
+                            @click="$router.push({ path: '/hall/productList/technologyList', query: { column_name: '技术成果', dockid: dock_id } })"
                             v-if="demandList.length > 6"
                             >查看所有项目</el-button
                           >
@@ -220,7 +220,7 @@
                         <el-button
                           type="primary"
                           size="mini"
-                          @click="$router.push({ path: '/hall/productList/technologyList', query: { column_name: '技术', dockid: dock_id } })"
+                          @click="$router.push({ path: '/hall/productList/technologyList', query: { column_name: '科技需求', dockid: dock_id } })"
                           v-if="jishulist.length > 10"
                           >查看所有项目</el-button
                         >

src/views/hall/productList/technologyList.vue

@@ -83,15 +83,15 @@ export default {
       if (this.$checkRes(res)) {
         let productList = res.data.apply.map(item => item.goodsList);
         productList = _.flattenDeep(productList);
-        if (this.column_name == '技术') {
+        if (this.column_name == '科技需求') {
           var jishuList = productList.filter(item => item.type === '0');
           this.$set(this, `applyList`, jishuList);
           this.$set(this, `total`, jishuList.length);
-        } else if (this.column_name == '产品') {
+        } else if (this.column_name == '技术成果') {
           var jishuList = productList.filter(item => item.type === '1');
           this.$set(this, `applyList`, jishuList);
           this.$set(this, `total`, jishuList.length);
-        } else if (this.column_name == '服务') {
+        } else if (this.column_name == '商务服务') {
           var jishuList = productList.filter(item => item.type === '2');
           this.$set(this, `applyList`, jishuList);
           this.$set(this, `total`, jishuList.length);

src/views/hallList/备份/zongjie.vue

@@ -96,7 +96,7 @@ export default {
   data: () => ({
     act: '0',
     productList: [],
-    proTitle: ['技术', '产品', '服务'],
+    proTitle: ['科技需求', '技术成果', '商务服务'],
     proAxis: { x: 'name', xAlias: '产品类型', y: 'value', yAlias: '数量' },
     personList: [],
     perAxis: { x: 'name', xAlias: '用户类型', y: 'value', yAlias: '人数' },
@@ -156,17 +156,17 @@ export default {
       let keys = Object.keys(garr);
       let res = keys.map(i => {
         let obj = { value: garr[i].length, type: i };
-        if (i == 0) obj.name = '技术';
-        if (i == 1) obj.name = '产品';
-        if (i == 2) obj.name = '服务';
+        if (i == 0) obj.name = '科技需求';
+        if (i == 1) obj.name = '技术成果';
+        if (i == 2) obj.name = '商务服务';
         return obj;
       });
       let r = res.some(f => f.type == 0);
-      if (!r) res.push({ value: 0, name: '技术', type: 0 });
+      if (!r) res.push({ value: 0, name: '科技需求', type: 0 });
       r = res.some(f => f.type == 1);
-      if (!r) res.push({ value: 0, name: '产品', type: 1 });
+      if (!r) res.push({ value: 0, name: '技术成果', type: 1 });
       r = res.some(f => f.type == 2);
-      if (!r) res.push({ value: 0, name: '服务', type: 2 });
+      if (!r) res.push({ value: 0, name: '商务服务', type: 2 });
       this.$set(this, `productList`, res);
     },
     proPerson(data) {

src/views/notice/productForm.vue

@@ -550,7 +550,7 @@ export default {
           label: '产品类型',
           prop: 'type',
           format: item => {
-            return item === '0' ? '技术' : item === '1' ? '产品' : '商务';
+            return item === '0' ? '科技需求' : item === '1' ? '技术成果' : '商务服务';
           },
         },
         { label: '所属领域', prop: 'field' },

src/views/superAdminCenter/enterpriseProduct/index.vue

@@ -28,16 +28,16 @@
             </el-form-item>
             <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-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="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-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="名称">

src/views/superAdminCenter/enterpriseProduct/parts/one.vue

@@ -13,7 +13,7 @@
           </el-table-column>
           <el-table-column label="产品类型 " align="center">
             <template v-slot="scoped">
-              {{ `${scoped.row.type}` === `0` ? '技术' : `${scoped.row.type}` === `1` ? '产品' : `${scoped.row.type}` === `2` ? '服务' : '' }}
+              {{ `${scoped.row.type}` === `0` ? '科技需求' : `${scoped.row.type}` === `1` ? '技术成果' : `${scoped.row.type}` === `2` ? '商务服务' : '' }}
             </template>
           </el-table-column>
           <el-table-column prop="state" label="状态" align="center">

src/views/superAdminCenter/enterpriseProduct/parts/three.vue

@@ -13,7 +13,7 @@
           </el-table-column>
           <el-table-column prop="totaltype" label="产品类型 " align="center">
             <template v-slot="scoped">
-              {{ `${scoped.row.type}` === `0` ? '技术' : `${scoped.row.type}` === `1` ? '产品' : `${scoped.row.type}` === `2` ? '服务' : '' }}
+              {{ `${scoped.row.type}` === `0` ? '科技需求' : `${scoped.row.type}` === `1` ? '技术成果' : `${scoped.row.type}` === `2` ? '商务服务' : '' }}
             </template>
           </el-table-column>
           <el-table-column prop="state" label="状态" align="center">

src/views/superAdminCenter/enterpriseProduct/parts/two.vue

@@ -13,7 +13,7 @@
           </el-table-column>
           <el-table-column prop="totaltype" label="产品类型 " align="center">
             <template v-slot="scoped">
-              {{ `${scoped.row.type}` === `0` ? '技术' : `${scoped.row.type}` === `1` ? '产品' : `${scoped.row.type}` === `2` ? '服务' : '' }}
+              {{ `${scoped.row.type}` === `0` ? '科技需求' : `${scoped.row.type}` === `1` ? '技术成果' : `${scoped.row.type}` === `2` ? '商务服务' : '' }}
             </template>
           </el-table-column>
           <el-table-column prop="state" label="状态" align="center">

src/views/superAdminCenter/productSolicit/index.vue

@@ -24,7 +24,8 @@
             </el-form-item>
             <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-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="名称"> <el-input v-model="form.name" placeholder="请输入名称"></el-input> </el-form-item>

src/views/superAdminCenter/productSolicit/parts/one.vue

@@ -6,7 +6,7 @@
           <el-table-column prop="name" label="产品名称" align="center"> </el-table-column>
           <el-table-column prop="type" label="产品类型 " align="center">
             <template v-slot="scoped">
-              {{ `${scoped.row.type}` === `0` ? '技术' : `${scoped.row.type}` === `1` ? '产品' : `${scoped.row.type}` === `2` ? '服务' : '' }}
+              {{ `${scoped.row.type}` === `0` ? '科技需求' : `${scoped.row.type}` === `1` ? '技术成果' : `${scoped.row.type}` === `2` ? '商务服务' : '' }}
             </template>
           </el-table-column>
           <el-table-column prop="status" label="状态" align="center">

src/views/superAdminCenter/productSolicit/parts/three.vue

@@ -6,7 +6,7 @@
           <el-table-column prop="name" label="产品名称" align="center"> </el-table-column>
           <el-table-column prop="type" label="产品类型 " align="center">
             <template v-slot="scoped">
-              {{ `${scoped.row.type}` === `0` ? '技术' : `${scoped.row.type}` === `1` ? '产品' : `${scoped.row.type}` === `2` ? '服务' : '' }}
+              {{ `${scoped.row.type}` === `0` ? '科技需求' : `${scoped.row.type}` === `1` ? '技术成果' : `${scoped.row.type}` === `2` ? '商务服务' : '' }}
             </template>
           </el-table-column>
           <el-table-column prop="state" label="状态" align="center">

src/views/superAdminCenter/productSolicit/parts/two.vue

@@ -6,7 +6,7 @@
           <el-table-column prop="name" label="产品名称" align="center"> </el-table-column>
           <el-table-column prop="type" label="产品类型 " align="center">
             <template v-slot="scoped">
-              {{ `${scoped.row.type}` === `0` ? '技术' : `${scoped.row.type}` === `1` ? '产品' : `${scoped.row.type}` === `2` ? '服务' : '' }}
+              {{ `${scoped.row.type}` === `0` ? '科技需求' : `${scoped.row.type}` === `1` ? '技术成果' : `${scoped.row.type}` === `2` ? '商务服务' : '' }}
             </template>
           </el-table-column>
           <el-table-column prop="state" label="状态" align="center">

src/views/userCenter/productInfo/part/already.vue

@@ -23,7 +23,7 @@
               </span>
             </el-col>
             <el-col :span="6" class="product">
-              <p>类型：{{ item.type === '0' ? '技术' : item.type === '1' ? '产品' : item.type === '2' ? '服务' : 'underdind' }}</p>
+              <p>类型：{{ item.type === '0' ? '科技需求' : item.type === '1' ? '技术成果' : item.type === '2' ? '商务服务' : 'underdind' }}</p>
               <span v-if="item.type === '0' || item.type === '1'">
                 <p>所属领域:{{ item.field }}</p>
                 <p>合作方式:{{ item.cooperation }}</p>

src/views/userCenter/productInfo/part/statusIn.vue

@@ -23,7 +23,7 @@
               </span>
             </el-col>
             <el-col :span="6" class="product">
-              <p>类型：{{ item.type === '0' ? '技术' : item.type === '1' ? '产品' : item.type === '2' ? '服务' : 'underdind' }}</p>
+              <p>类型：{{ item.type === '0' ? '科技需求' : item.type === '1' ? '技术成果' : item.type === '2' ? '商务服务' : 'underdind' }}</p>
               <span v-if="item.type === '0' || item.type === '1'">
                 <p>所属领域:{{ item.field }}</p>
                 <p>合作方式:{{ item.cooperation }}</p>

src/views/userCenter/productInfo/part/stay.vue

@@ -23,7 +23,7 @@
               </span>
             </el-col>
             <el-col :span="6" class="product">
-              <p>类型：{{ item.type === '0' ? '技术' : item.type === '1' ? '产品' : item.type === '2' ? '服务' : 'underdind' }}</p>
+              <p>类型：{{ item.type === '0' ? '科技需求' : item.type === '1' ? '技术成果' : item.type === '2' ? '商务服务' : 'underdind' }}</p>
               <span v-if="item.type === '0' || item.type === '1'">
                 <p>所属领域:{{ item.field }}</p>
                 <p>合作方式:{{ item.cooperation }}</p>
@@ -125,7 +125,9 @@ export default {
       skip = this.skip;
       let userid = this.user.uid;
       const res = await this.productList({ skip, status: 2, userid, ...info });
+      console.log(res);
       const resTwo = await this.productList({ skip, status: 3, userid, ...info });
+      console.log(resTwo);
       var newData = res.data.concat(resTwo.data);
       if (newData.length != 0) {
         this.$set(this, `newDataList`, newData);