Merge branch 'dev' of licailing/zhirongip into master

src/main/vue/src/views/demand/CopyrightDemandEdit.vue

@@ -193,13 +193,7 @@ export default {
         onSave() {
             this.$refs.form.validate(valid => {
                 if (valid) {
-                    this.$confirm('发布成功', '提示', {
-                        confirmButtonText: '继续发布',
-                        cancelButtonText: '退出',
-                        type: 'warning'
-                    }).then(() => {
-                        this.submit();
-                    });
+                    this.submit();
                 } else {
                     return false;
                 }

src/main/vue/src/views/demand/LogoDemandEdit.vue

@@ -183,13 +183,7 @@ export default {
         onSave() {
             this.$refs.form.validate(valid => {
                 if (valid) {
-                    this.$confirm('发布成功', '提示', {
-                        confirmButtonText: '继续发布',
-                        cancelButtonText: '退出',
-                        type: 'warning'
-                    }).then(() => {
-                        this.submit();
-                    });
+                    this.submit();
                 } else {
                     return false;
                 }

src/main/vue/src/views/demand/PatentDemandEdit.vue

@@ -227,13 +227,7 @@ export default {
         onSave() {
             this.$refs.form.validate(valid => {
                 if (valid) {
-                    this.$confirm('发布成功', '提示', {
-                        confirmButtonText: '继续发布',
-                        cancelButtonText: '退出',
-                        type: 'warning'
-                    }).then(() => {
-                        this.submit();
-                    });
+                    this.submit();
                 } else {
                     return false;
                 }

src/main/vue/src/views/demand/TechProductDemandEdit.vue

@@ -274,13 +274,7 @@ export default {
         onSave() {
             this.$refs.form.validate(valid => {
                 if (valid) {
-                    this.$confirm('发布成功', '提示', {
-                        confirmButtonText: '继续发布',
-                        cancelButtonText: '退出',
-                        type: 'warning'
-                    }).then(() => {
-                        this.submit();
-                    });
+                    this.submit();
                 } else {
                     return false;
                 }

src/main/vue/src/views/supply/CopyrightEdit.vue

@@ -262,13 +262,7 @@ export default {
         onSave() {
             this.$refs.form.validate(valid => {
                 if (valid) {
-                    this.$confirm('发布成功', '提示', {
-                        confirmButtonText: '继续发布',
-                        cancelButtonText: '退出',
-                        type: 'warning'
-                    }).then(() => {
-                        this.submit();
-                    });
+                    this.submit();
                 } else {
                     return false;
                 }

src/main/vue/src/views/supply/LogoEdit.vue

@@ -259,13 +259,7 @@ export default {
         onSave() {
             this.$refs.form.validate(valid => {
                 if (valid) {
-                    this.$confirm('发布成功', '提示', {
-                        confirmButtonText: '继续发布',
-                        cancelButtonText: '退出',
-                        type: 'warning'
-                    }).then(() => {
-                        this.submit();
-                    });
+                    this.submit();
                 } else {
                     return false;
                 }

src/main/vue/src/views/supply/PatentEdit.vue

@@ -336,13 +336,7 @@ export default {
         onSave() {
             this.$refs.form.validate(valid => {
                 if (valid) {
-                    this.$confirm('发布成功', '提示', {
-                        confirmButtonText: '继续发布',
-                        cancelButtonText: '退出',
-                        type: 'warning'
-                    }).then(() => {
-                        this.submit();
-                    });
+                    this.submit();
                 } else {
                     return false;
                 }

src/main/vue/src/views/supply/ProductList.vue

@@ -45,7 +45,7 @@
                     :value="item.value"
                 ></el-option>
             </el-select>
-            <el-select v-model="stage" placeholder="请选择技术成熟度" class="filter-item" clearable @change="getData">
+            <el-select v-model="stage" placeholder="请选择所处阶段" class="filter-item" clearable @change="getData">
                 <el-option
                     v-for="item in stageOptions"
                     :key="item.value"

src/main/vue/src/views/supply/TechnicalManagerList.vue

@@ -117,12 +117,13 @@
 <script>
 import { mapState } from 'vuex';
 import pageableTable from '@/mixins/pageableTable';
+import tradingMethod from '@/mixins/tradingMethod';
 import SettingSelect from '../../components/select/SettingSelect.vue';
 
 export default {
     components: { SettingSelect },
     name: 'TechnicalManagerList',
-    mixins: [pageableTable],
+    mixins: [pageableTable, tradingMethod],
     data() {
         return {
             multipleMode: false,

src/main/vue/src/views/supply/TechnologyList.vue

@@ -45,7 +45,7 @@
                     :value="item.value"
                 ></el-option>
             </el-select>
-            <el-select v-model="stage" placeholder="请选择技术成熟度" class="filter-item" clearable @change="getData">
+            <el-select v-model="stage" placeholder="请选择所处阶段" class="filter-item" clearable @change="getData">
                 <el-option
                     v-for="item in stageOptions"
                     :key="item.value"

src/main/vue/src/views/supply/TechnologyProductEdit.vue

@@ -301,13 +301,7 @@ export default {
         onSave() {
             this.$refs.form.validate(valid => {
                 if (valid) {
-                    this.$confirm('发布成功', '提示', {
-                        confirmButtonText: '继续发布',
-                        cancelButtonText: '退出',
-                        type: 'warning'
-                    }).then(() => {
-                        this.submit();
-                    });
+                    this.submit();
                 } else {
                     return false;
                 }