更新

src/layout/enterprise/contextfabu.vue

@@ -5,71 +5,74 @@
         <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
           <el-tab-pane label="我的发布" name="first">
             <el-row class="demandForm">
-              <el-form ref="form" :model="demandForm" label-width="80px" :rules="rules">
+              <el-form ref="form" :model="form" label-width="130px" :rules="rules">
                 <el-form-item label="产品类型" prop="totaltype">
-                  <el-select v-model="demandForm.totaltype" placeholder="请选择产品类型" @change="selectType">
-                    <el-option v-for="(item, index) in totaltype_list" :key="index" :value="item.value" :label="item.name"></el-option>
+                  <el-select v-model="form.totaltype" 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>
-                <span v-if="demandForm.totaltype == 0">
-                  <el-form-item label="选择不显示的信息">
-                    <el-select v-model="is_display" multiple placeholder="请选择" style="width:100%">
-                      <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
-                    </el-select>
-                  </el-form-item>
-                </span>
-                <span v-if="demandForm.totaltype == 1">
-                  <el-form-item label="选择不显示的信息">
-                    <el-select v-model="demandForm.is_display" multiple placeholder="请选择" style="width:100%">
-                      <el-option v-for="item in option2" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
-                    </el-select>
-                  </el-form-item>
-                </span>
-                <span v-if="demandForm.totaltype == 2">
-                  <el-form-item label="选择不显示的信息">
-                    <el-select v-model="demandForm.is_display" multiple placeholder="请选择" style="width:100%">
-                      <el-option v-for="item in option3" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
-                    </el-select>
-                  </el-form-item>
-                </span>
-                <el-form-item label="产品名称" prop="name">
-                  <el-input v-model="demandForm.name" placeholder="请输入产品名称"></el-input>
+                <!-- <span v-if="form.totaltype == 0">
+              <el-form-item label="选择不显示的信息">
+                <el-select v-model="form.is_display" multiple placeholder="请选择" style="width:100%">
+                  <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
+                </el-select>
+              </el-form-item>
+            </span>
+            <span v-if="form.totaltype == 1">
+              <el-form-item label="选择不显示的信息">
+                <el-select v-model="form.is_display" multiple placeholder="请选择" style="width:100%">
+                  <el-option v-for="item in option2" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
+                </el-select>
+              </el-form-item>
+            </span>
+            <span v-if="form.totaltype == 2">
+              <el-form-item label="选择不显示的信息">
+                <el-select v-model="form.is_display" multiple placeholder="请选择" style="width:100%">
+                  <el-option v-for="item in option3" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
+                </el-select>
+              </el-form-item>
+            </span> -->
+                <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="demandForm.product_type_id" filterable @change="selectChild">
+                  <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="totaltype == 0">
-                  <el-form-item label="研发阶段">
-                    <el-select v-model="demandForm.phase" placeholder="请选择研发阶段">
-                      <el-option label="阶段成果" value="1"></el-option>
-                      <el-option label="最终成果" value="2"></el-option>
+                <el-form-item label="产品简介">
+                  <el-input v-model="form.introduction" placeholder="请输入产品简介"></el-input>
+                </el-form-item>
+                <span>
+                  <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>
                 </span>
-                <el-form-item label="产品简介">
-                  <el-input v-model="demandForm.introduction" placeholder="请输入产品简介"></el-input>
-                </el-form-item>
                 <el-row>
                   <el-col :span="12">
-                    <el-form-item label="产品单价">
-                      <el-input v-model="demandForm.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="demandForm.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>
                 </el-row>
                 <el-form-item label="产品图片" prop="image">
-                  <!-- <upload :limit="1" :data="acc.url" type="url" :url="'/files/image/upload'" @upload="uploadSuccess"></upload> -->
                   <upload
                     :limit="6"
-                    :data="demandForm.image"
+                    :data="form.image"
                     :uploadBtn="true"
                     type="image"
                     :url="`/files/image/upload`"
@@ -77,65 +80,124 @@
                     @delete="uploadDelete"
                   ></upload>
                 </el-form-item>
-                <span v-if="totaltype == 0 || totaltype == 1">
-                  <el-form-item label="产品参数">
-                    <template>
-                      <el-col :span="12">
-                        <el-table :data="product_args" ref="table" tooltip-effect="dark" border stripe @selection-change="selectRow">
-                          <el-table-column label="参数名称">
-                            <template slot-scope="scope">
-                              <el-input v-model="scope.row.arg_name"></el-input>
-                            </template>
-                          </el-table-column>
-                          <el-table-column label="参数内容">
-                            <template slot-scope="scope">
-                              <el-input v-model="scope.row.memo"></el-input>
-                            </template>
-                          </el-table-column>
-                        </el-table>
-                      </el-col>
-                      <el-col :span="12">
-                        <el-button type="primary" @click.prevent="addRow()">添加参数</el-button>
-                      </el-col>
-                    </template>
-                  </el-form-item>
-                </span>
-                <span v-if="totaltype == 0 || totaltype == 2">
-                  <el-form-item label="应用领域">
-                    <el-input v-model="demandForm.field" placeholder="请输入应用领域"></el-input>
+                <!-- <span>
+              <el-form-item label="产品参数">
+                <template>
+                  <el-col :span="12">
+                    <el-table :data="form.product_args" ref="table" tooltip-effect="dark" border stripe @selection-change="selectRow">
+                      <el-table-column label="参数名称">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.arg_name"></el-input>
+                        </template>
+                      </el-table-column>
+                      <el-table-column label="参数内容">
+                        <template slot-scope="scope">
+                          <el-input v-model="scope.row.memo"></el-input>
+                        </template>
+                      </el-table-column>
+                    </el-table>
+                  </el-col>
+                  <el-col :span="12">
+                    <el-button type="primary" @click.prevent="addRow()">添加参数</el-button>
+                  </el-col>
+                </template>
+              </el-form-item>
+            </span> -->
+                <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 v-model="demandForm.contract" placeholder="请输入电子合同"></el-input>
-                </el-form-item> -->
-                <!-- <el-form-item label="供给类型">
-                  <el-select v-model="demandForm.gxtype" placeholder="请选择供给类型">
-                    <el-option label="需" value="0"></el-option>
-                    <el-option label="供" value="1"></el-option>
-                  </el-select>
-                </el-form-item> -->
                 <el-form-item label="服务范围">
-                  <el-input type="textarea" v-model="demandForm.scope" placeholder="请输入产品名称"></el-input>
+                  <el-input type="textarea" v-model="form.scope" placeholder="请输入服务范围"></el-input>
                 </el-form-item>
-                <!-- <el-form-item label="知识产权">
-                  <el-input v-model="demandForm.property" placeholder="请输入知识产权"></el-input>
-                </el-form-item> -->
-                <el-form-item label="交易方式">
-                  <el-select v-model="demandForm.business" placeholder="请选择交易方式">
+                <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="demandForm.contact_user" placeholder="请输入联系人"></el-input>
+                  <el-input v-model="form.contact_user" placeholder="请输入联系人"></el-input>
                 </el-form-item>
                 <el-form-item label="联系电话" prop="contact_tel">
-                  <el-input v-model="demandForm.contact_tel" placeholder="请输入联系电话"></el-input>
+                  <el-input v-model.number="form.contact_tel" placeholder="请输入联系电话" maxlength="11"></el-input>
                 </el-form-item>
-                <!-- <el-form-item label="产品描述">
-                  <el-input type="textarea" v-model="demandForm.description" placeholder="请输入产品描述"></el-input>
-                </el-form-item> -->
                 <el-row class="demandBtn">
                   <el-button type="primary" @click="demandBtn()">保存草稿</el-button>
                   <el-button type="primary" @click="demandBtns()">信息发布</el-button>
@@ -143,7 +205,6 @@
               </el-form>
             </el-row>
           </el-tab-pane>
-          <!-- <el-tab-pane label="供给发布" name="second">供给发布</el-tab-pane> -->
         </el-tabs>
       </el-col>
     </el-row>
@@ -153,18 +214,20 @@
 <script>
 import _ from 'lodash';
 import upload from '@/components/upload.vue';
+import { mapState, createNamespacedHelpers } from 'vuex';
+const { mapActions: mapMarkettype } = createNamespacedHelpers('markettype');
 export default {
   name: 'contextfabu',
   props: {
-    demandForm: null,
-    columnList: null,
-    totaltype: null,
-    anniu: null,
+    form: null,
   },
   components: {
     upload,
   },
   data: () => ({
+    // 类型
+    columnList: [],
+    activeName: 'first',
     options: [
       {
         value: 'totaltype',
@@ -234,7 +297,6 @@ export default {
         label: '交易方式',
       },
     ],
-
     option2: [
       {
         value: 'totaltype',
@@ -297,7 +359,6 @@ export default {
         label: '交易方式',
       },
     ],
-
     option3: [
       {
         value: 'totaltype',
@@ -361,68 +422,46 @@ export default {
         label: '交易方式',
       },
     ],
-    is_display: [],
-    value1: [],
-    value2: [],
-
-    activeName: 'first',
-    priceunit_list: [
-      {
-        name: '公斤',
-      },
-      {
-        name: '套',
-      },
-      {
-        name: '件',
-      },
-    ],
-    product_args: [],
-    selectlistRow: [],
-    rowNum: 1,
-    totaltype_list: [
-      { name: '技术', value: '0' },
-      { name: '产品', value: '1' },
-      { name: '服务', value: '2' },
-    ],
-
-    rules: {
-      name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-      totaltype: [{ required: true, message: '请选择类型', trigger: 'change' }],
-      image: [{ type: 'array', required: true, message: '请上传图片', trigger: 'blur' }],
-      contact_tel: [{ required: true, message: '请输入联系电话', trigger: 'blur' }],
-      contact_user: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
-    },
+    rules: {},
   }),
-  created() {},
+  created() {
+    this.maarkettype();
+  },
   computed: {},
   methods: {
+    ...mapMarkettype({ markettypeList: 'query' }),
+    // 查询类型
+    async maarkettype({ category = 54, ...info } = {}) {
+      const res = await this.markettypeList({ category, ...info });
+      if (this.$checkRes(res)) {
+        this.$set(this, `columnList`, res.data);
+      }
+    },
     handleClick(tab, event) {
       console.log(tab, event);
     },
     demandBtn() {
-      this.demandForm.product_args = this.product_args;
-      this.$emit('demandSubmit', { data: this.demandForm, id: this.demandForm.id });
+      this.$emit('demandBtn', { data: this.form });
     },
     demandBtns() {
-      this.$emit('demandSubmits', { data: this.demandForm, id: this.demandForm.id });
+      this.$emit('demandBtns', { data: this.form });
     },
     selectChild(product_type_id) {
       let res = this.columnList.filter(fil => fil.id === product_type_id);
       if (res.length > 0) {
         console.log(res[0].name);
-        this.$set(this.demandForm, `product_type_name`, res[0].name);
+        this.$set(this.form, `product_type_name`, res[0].name);
       }
       this.$forceUpdate();
     },
     uploadSuccess({ type, data }) {
-      let arr = _.get(this.demandForm, type);
+      let arr = _.get(this.form, type);
       if (_.isArray(arr)) {
         let datas = { name: data.name, url: data.uri };
-        this.demandForm[type].push({ name: data.name, url: data.uri });
+        this.form[type].push({ name: data.name, url: data.uri });
       } else {
         let newArr = [{ name: data.name, url: data.uri }];
-        this.$set(this.demandForm, `${type}`, newArr);
+        this.$set(this.form, `${type}`, newArr);
       }
     },
 

src/views/market/marketfabu.vue

@@ -4,7 +4,7 @@
       <div class="w_1200">
         <div class="servicemain">
           <div class="infocontext">
-            <contextfabu v-on="$listeners" :anniu="anniu" :demandForm="demandForm" @demandSubmit="sumbit" :columnList="columnList"></contextfabu>
+            <contextfabu v-on="$listeners" :form="form" @demandBtn="demandBtn" @demandBtns="demandBtns"></contextfabu>
           </div>
         </div>
       </div>
@@ -25,20 +25,16 @@ export default {
   },
   data: () => {
     return {
-      demandForm: {},
-      columnList: [],
-      anniu: 1,
+      form: {},
     };
   },
-  created() {
-    this.maarkettype();
-  },
+  created() {},
   methods: {
     ...mapMarkettype({ markettypeList: 'query' }),
     ...mapMarketproduct({ productFetch: 'fetch', productCreate: 'create', productUpdate: 'update' }),
-    async sumbit(demandForm) {
-      this.demandForm.status = '0';
-      let data = this.demandForm;
+    async demandBtn({ data }) {
+      console.log(data);
+      data.status = '3';
       data.userid = this.user.uid;
       let res;
       let msg;
@@ -47,16 +43,23 @@ export default {
         msg = `${this.keyWord}修改成功`;
       } else {
         res = await this.productCreate(data);
-        msg = `${this.keyWord}添加成功等待审核`;
+        msg = `${this.keyWord}保存草稿成功`;
       }
       if (this.$checkRes(res, msg)) this.$router.push({ path: '/market/index' });
     },
-    // 查询类型
-    async maarkettype({ category = 54, ...info } = {}) {
-      const res = await this.markettypeList({ category, ...info });
-      if (this.$checkRes(res)) {
-        this.$set(this, `columnList`, res.data);
+    async demandBtns({ data }) {
+      data.status = '0';
+      data.userid = this.user.uid;
+      let res;
+      let msg;
+      if (data.id) {
+        res = await this.productUpdate(data);
+        msg = `${this.keyWord}修改成功`;
+      } else {
+        res = await this.productCreate(data);
+        msg = `${this.keyWord}添加成功等待审核`;
       }
+      if (this.$checkRes(res, msg)) this.$router.push({ path: '/market/index' });
     },
   },
   computed: {

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

@@ -17,8 +17,27 @@
             </el-col>
             <el-col :span="6" class="product">
               <p>类别：{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : 'underdind' }}</p>
-              <p class="textOver">交易方式{{ item.business == '0' ? '公用' : item.business == '1' ? '竞用' : item.business == '2' ? '转让' : '未识别' }}</p>
-              <p>{{ item.price }}/{{ item.priceunit }}</p>
+              <p>
+                所属领域:{{
+                  item.field == '0'
+                    ? '先进制造'
+                    : item.field == '1'
+                    ? '新材料'
+                    : item.field == '2'
+                    ? '光电子'
+                    : item.field == '3'
+                    ? '信息技术'
+                    : item.field == '4'
+                    ? '文化和科技融合'
+                    : '暂无'
+                }}
+              </p>
+              <p class="textOver" v-if="item.business">
+                交易方式:{{ item.business == '0' ? '公用' : item.business == '1' ? '竞用' : item.business == '2' ? '转让' : '未识别' }}
+              </p>
+              <p v-if="item.price">
+                {{ item.price }}/{{ item.priceunit == '0' ? '公斤' : item.priceunit == '1' ? '套' : item.priceunit == '2' ? '件' : '暂无' }}
+              </p>
             </el-col>
             <el-col :span="9" class="intro">
               <p>产品简介:</p>
@@ -147,7 +166,7 @@ export default {
       padding: 0 15px;
       border-right: 1px dashed #ccc;
       p {
-        padding: 8px 0;
+        padding: 4px 0;
         font-size: 14px;
       }
       p:last-child {

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

@@ -9,10 +9,12 @@
           <el-form ref="form" :model="form" label-width="130px" :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>
-            <span v-if="form.totaltype == 0">
+            <!-- <span v-if="form.totaltype == 0">
               <el-form-item label="选择不显示的信息">
                 <el-select v-model="form.is_display" multiple placeholder="请选择" style="width:100%">
                   <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
@@ -32,42 +34,43 @@
                   <el-option v-for="item in option3" :key="item.value" :label="item.label" :value="item.value" :disabled="item.disabled"> </el-option>
                 </el-select>
               </el-form-item>
-            </span>
-            <el-form-item label="产品名称" prop="name">
-              <el-input v-model="form.name" placeholder="请输入产品名称"></el-input>
+            </span> -->
+            <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-form-item label="产品简介">
+              <el-input v-model="form.introduction" placeholder="请输入产品简介"></el-input>
+            </el-form-item>
+            <span>
+              <el-form-item label="研发阶段" v-if="form.totaltype == null || form.totaltype == '0'">
                 <el-select v-model="form.phase" placeholder="请选择研发阶段">
-                  <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-select>
               </el-form-item>
             </span>
-            <el-form-item label="产品简介">
-              <el-input v-model="form.introduction" placeholder="请输入产品简介"></el-input>
-            </el-form-item>
             <el-row>
               <el-col :span="12">
-                <el-form-item label="产品单价">
+                <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-form-item label="产品单位" v-if="form.totaltype == null || form.totaltype == '0' || form.totaltype == '1'">
                   <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-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>
             </el-row>
             <el-form-item label="产品图片" prop="image">
-              <!-- <upload :limit="1" :data="acc.url" type="url" :url="'/files/image/upload'" @upload="uploadSuccess"></upload> -->
               <upload
                 :limit="6"
                 :data="form.image"
@@ -78,11 +81,11 @@
                 @delete="uploadDelete"
               ></upload>
             </el-form-item>
-            <span v-if="form.totaltype == 0 || form.totaltype == 1">
+            <!-- <span>
               <el-form-item label="产品参数">
                 <template>
                   <el-col :span="12">
-                    <el-table :data="product_args" ref="table" tooltip-effect="dark" border stripe @selection-change="selectRow">
+                    <el-table :data="form.product_args" ref="table" tooltip-effect="dark" border stripe @selection-change="selectRow">
                       <el-table-column label="参数名称">
                         <template slot-scope="scope">
                           <el-input v-model="scope.row.arg_name"></el-input>
@@ -100,27 +103,101 @@
                   </el-col>
                 </template>
               </el-form-item>
-            </span>
-            <span v-if="form.totaltype == 0 || form.totaltype == 2">
-              <el-form-item label="应用领域">
-                <el-input v-model="form.field" placeholder="请输入应用领域"></el-input>
+            </span> -->
+            <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-input type="textarea" v-model="form.scope" placeholder="请输入服务范围"></el-input>
+            </el-form-item>
+            <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="交易方式">
+            <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 @click="draftBtn('form')">保存草稿</el-button>
@@ -149,26 +226,8 @@ export default {
   },
   data: function() {
     return {
-      // 产品类型
-      totaltype_list: [
-        { name: '技术', value: '0' },
-        { name: '产品', value: '1' },
-        { name: '服务', value: '2' },
-      ],
       // 类型
       columnList: [],
-      // 单位
-      priceunit_list: [
-        {
-          name: '公斤',
-        },
-        {
-          name: '套',
-        },
-        {
-          name: '件',
-        },
-      ],
       // 不显示的信息
       // 技术
       options: [
@@ -223,7 +282,7 @@ export default {
         },
         {
           value: 'field',
-          label: '应用领域',
+          label: '所属领域',
         },
         {
           value: 'scope',
@@ -351,10 +410,12 @@ export default {
       // 验证
       rules: {
         name: [{ required: true, message: '请输入名称', trigger: 'blur' }],
-        totaltype: [{ required: true, message: '请选择类型', trigger: 'change' }],
-        image: [{ type: 'array', required: true, message: '请上传图片', trigger: 'blur' }],
-        contact_tel: [{ required: true, message: '请输入联系电话', trigger: 'blur' }],
+        totaltype: [{ required: true, message: '请输入名称', trigger: 'change' }],
         contact_user: [{ required: true, message: '请输入联系人', trigger: 'blur' }],
+        contact_tel: [
+          { required: true, message: '请输入联系电话', trigger: 'blur' },
+          // { type: 'number', message: '电话必须为数字值' },
+        ],
       },
     };
   },
@@ -369,8 +430,15 @@ export default {
       this.$emit('draftBtn', { data: this.form });
     },
     // 信息发布
-    submitBtn() {
-      this.$emit('submitBtn', { data: this.form });
+    submitBtn(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          this.$emit('submitBtn', { data: this.form });
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
     },
     // 查询类型
     async maarkettype({ category = 54, ...info } = {}) {
@@ -411,7 +479,7 @@ export default {
         rowNum: this.rowNum,
       };
       // let tableData = this.emandForm.product_args;
-      this.product_args.unshift(list);
+      this.form.product_args.unshift(list);
       this.rowNum += 1;
     },
     back() {

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

@@ -17,8 +17,27 @@
             </el-col>
             <el-col :span="6" class="product">
               <p>类别：{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : 'underdind' }}</p>
-              <p class="textOver">交易方式{{ item.business == '0' ? '公用' : item.business == '1' ? '竞用' : item.business == '2' ? '转让' : '未识别' }}</p>
-              <p>{{ item.price }}/{{ item.priceunit }}</p>
+              <p>
+                所属领域:{{
+                  item.field == '0'
+                    ? '先进制造'
+                    : item.field == '1'
+                    ? '新材料'
+                    : item.field == '2'
+                    ? '光电子'
+                    : item.field == '3'
+                    ? '信息技术'
+                    : item.field == '4'
+                    ? '文化和科技融合'
+                    : '暂无'
+                }}
+              </p>
+              <p class="textOver" v-if="item.business">
+                交易方式:{{ item.business == '0' ? '公用' : item.business == '1' ? '竞用' : item.business == '2' ? '转让' : '未识别' }}
+              </p>
+              <p v-if="item.price">
+                {{ item.price }}/{{ item.priceunit == '0' ? '公斤' : item.priceunit == '1' ? '套' : item.priceunit == '2' ? '件' : '暂无' }}
+              </p>
             </el-col>
             <el-col :span="9" class="intro">
               <p>产品简介:</p>
@@ -147,7 +166,7 @@ export default {
       padding: 0 15px;
       border-right: 1px dashed #ccc;
       p {
-        padding: 8px 0;
+        padding: 4px 0;
         font-size: 14px;
       }
       p:last-child {

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

@@ -17,8 +17,27 @@
             </el-col>
             <el-col :span="6" class="product">
               <p>类别：{{ item.totaltype === '0' ? '技术' : item.totaltype === '1' ? '产品' : item.totaltype === '2' ? '服务' : 'underdind' }}</p>
-              <p class="textOver">交易方式{{ item.business == '0' ? '公用' : item.business == '1' ? '竞用' : item.business == '2' ? '转让' : '未识别' }}</p>
-              <p>{{ item.price }}/{{ item.priceunit }}</p>
+              <p>
+                所属领域:{{
+                  item.field === '0'
+                    ? '先进制造'
+                    : item.field === '1'
+                    ? '新材料'
+                    : item.field === '2'
+                    ? '光电子'
+                    : item.field === '3'
+                    ? '信息技术'
+                    : item.field === '4'
+                    ? '文化和科技融合'
+                    : '暂无'
+                }}
+              </p>
+              <p class="textOver" v-if="item.business">
+                交易方式:{{ item.business == '0' ? '公用' : item.business == '1' ? '竞用' : item.business == '2' ? '转让' : '未识别' }}
+              </p>
+              <p v-if="item.price">
+                {{ item.price }}/{{ item.priceunit == '0' ? '公斤' : item.priceunit == '1' ? '套' : item.priceunit == '2' ? '件' : '暂无' }}
+              </p>
             </el-col>
             <el-col :span="9" class="intro">
               <p>产品简介:</p>
@@ -169,7 +188,7 @@ export default {
       padding: 0 15px;
       border-right: 1px dashed #ccc;
       p {
-        padding: 8px 0;
+        padding: 4px 0;
         font-size: 14px;
       }
       p:last-child {