制造商，非制造商按钮

src/dashoo.cn/frontend_web/src/components/oilsupplier/goodslist2.vue

@@ -53,26 +53,18 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="right" width="245">
+        <el-table-column align="center" width="200">
           <template slot="header" slot-scope="scope">
-            <!-- <el-input v-model="search" size="mini" placeholder="输入关键字搜索"/> -->
             <el-button-group>
-              <el-button type="plain"  size="small" @click="setManufacturer(2)">制造商</el-button>
-              <el-button type="plain"  size="small" @click="setManufacturer(1)">非制造商<i class="el-icon--right"></i></el-button>
+              <el-button type="plain"  size="mini" @click="setManufacturer(2)">制造商</el-button>
+              <el-button type="plain"  size="mini" @click="setManufacturer(1)">非制造商</el-button>
             </el-button-group>
           </template>
-
           <template slot-scope="scope">
             <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope.row,canadd,newcanadd)" :disabled="isDisabledBtn()">非制造商</el-button>
             <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 1" @click="type_change(scope.row,canadd,newcanadd)" :disabled="isDisabledBtn()">制造商</el-button>
           </template>
         </el-table-column>
-        <!-- <el-table-column label="是否为制造商" width="105">
-          <template slot-scope="scope">
-            <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope.row,canadd,newcanadd)" :disabled="isDisabledBtn()">非制造商</el-button>
-            <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 1" @click="type_change(scope.row,canadd,newcanadd)" :disabled="isDisabledBtn()">制造商</el-button>
-          </template>
-        </el-table-column> -->
         <el-table-column prop="CertSubStatus"
                          label="状态"
                          show-overflow-tooltip>
@@ -321,16 +313,7 @@
             console.error(err)
           })
       },
-    setManufacturer(index){
-      console.log(index)
-       if (this.Ids.length == 0) {
-        this.$message({
-          type: 'warning',
-          message: '请先选择设置的条目'
-        })
-        return
-      }
-
+    setManufacturer (operTag){
       let _this = this
       _this.$confirm('是否确定此操作, 是否继续?', '提示', {
         confirmButtonText: '确定',
@@ -346,9 +329,9 @@
             CertSubIdList: [],
             SupplierId: parseInt(this.SupplierId),
             SupplierCertId: parseInt(this.SupplierCertId),
-            IsManufacturer: index
+            IsManufacturer: operTag
           }
-          _this.$axios.post('suppliercertsub/modify-manufacturer/' + this.Ids.join(),postData)
+          _this.$axios.post('suppliercertsub/modify-manufacturers/' + this.SupplierCertId, postData)
             .then(function (response) {
               if (response.data.code === 0) {
                 _this.$message({

src/dashoo.cn/frontend_web/src/components/usednameselect/index.vue

@@ -32,7 +32,7 @@
 
      },
     created() {
-      console.log(123,this.formData.SupplierName)
+      // console.log(123,this.formData.SupplierName)
       // 执行初始化方法
      this.initDatas()
       // this.initDatas()
@@ -77,7 +77,7 @@
         //   console.log(666666666,event)
           this.currentPage = 1
         // }
-        let params = {  
+        let params = {
           _size: this.size,
           _currentPage: this.currentPage,
           Order: this.Column.Order,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/basisedit.vue

@@ -335,18 +335,21 @@
           </el-card>
         </el-tab-pane>
 
-        <!--<el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">-->
-        <!--<el-card class="box-card" style="margin-top: 20px">-->
-        <!--<div slot="header" class="clearfix">-->
-        <!--<span>审批历史</span>-->
-        <!--</div>-->
-        <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
-        <!--</el-card>-->
-        <!--</el-tab-pane>-->
-
         <el-tab-pane label="供方交费"
                      v-if="formDataCert.Status == 5">
         </el-tab-pane>
+
+        <el-tab-pane label="企业曾用名" v-if="this.showcy">
+          <el-card class="box-card mycard" >
+            <div slot="header" class="clearfix">
+              <span>企业曾用名</span>
+            </div>
+            <usednameselect-index ref="usednameselectIndex"
+                                  :formData.sync="formData"
+                                  :entryinfo="entrydetail"></usednameselect-index>
+          </el-card>
+        </el-tab-pane>
+
       </el-tabs>
 
       <div style="float: right; margin: 20px;">
@@ -539,12 +542,11 @@ import BasisInfo from '@/components/oilsupplier/basisinfo'
 import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
 // import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 import FloatImgBtn from '@/components/floatButton/index'
-import ElButton from '../../../../../node_modules/element-ui/packages/button/src/button'
+import usednameselectIndex from '@/components/usednameselect/index'
 
 export default {
 
   components: {
-    ElButton,
     FloatImgBtn,
     SupplierFileTable,
     WfMultiHistory,
@@ -558,8 +560,8 @@ export default {
     WinningList, // 近三年省部级及以上获奖项目列表
     BusinessList, // 选择准入范围
     SubfileList, // 选择企业资质
-    BasisInfo
-
+    BasisInfo,
+    usednameselectIndex
     // ChooseAuditor
   },
   computed: {
@@ -568,7 +570,11 @@ export default {
     })
   },
   name: 'oilsupplierEdit',
-
+  created () {
+    if (this.$route.query.showcy) {
+      this.showcy = true
+    }
+  },
   data () {
     var checkWorkerTotal = (rule, value, callback) => {
       if (value <= 0) {
@@ -592,6 +598,7 @@ export default {
       }
     }
     return {
+      showcy: false,
       firOptions: [],
       loading: false,
       WorkerTotal: 0,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/goodsedit.vue

@@ -345,6 +345,17 @@
 
         <el-tab-pane label="供方交费"
                      v-if="formDataCert.Status == 5"></el-tab-pane>
+
+        <el-tab-pane label="企业曾用名" v-if="this.showcy">
+          <el-card class="box-card mycard" >
+            <div slot="header" class="clearfix">
+              <span>企业曾用名</span>
+            </div>
+            <usednameselect-index ref="usednameselectIndex"
+                                  :formData.sync="formData"
+                                  :entryinfo="entrydetail"></usednameselect-index>
+          </el-card>
+        </el-tab-pane>
       </el-tabs>
 
       <div style="float: right; margin: 20px;">
@@ -534,6 +545,7 @@ import GoodsInfo from '@/components/oilsupplier/goodsinfo'
 import ChooseAuditorFen from '@/components/oilsupplier/chooseauditorfenban'
 // import ChooseAuditor from '@/components/oilsupplier/chooseauditor'
 import FloatImgBtn from '@/components/floatButton/index'
+import usednameselectIndex from '@/components/usednameselect/index'
 
 export default {
   components: {
@@ -551,7 +563,7 @@ export default {
     GoodsList2, // 选择准入范围
     SubfileList2, // 选择企业资质
     GoodsInfo,
-
+    usednameselectIndex
     // ChooseAuditor
   },
   computed: {
@@ -560,7 +572,12 @@ export default {
     })
   },
   name: 'goodsEdit',
-
+  created () {
+    if (this.$route.query.showcy) {
+      debugger
+      this.showcy = true
+    }
+  },
   data () {
     var checkWorkerTotal = (rule, value, callback) => {
       if (value <= 0) {
@@ -584,6 +601,7 @@ export default {
       }
     }
     return {
+      showcy: false,
       loading: false,
       WorkerTotal: 0,
       isInvestigate: false,

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/_opera/techedit.vue

@@ -333,39 +333,20 @@
           </el-card>
         </el-tab-pane>
 
-        <el-tab-pane label="企业曾用名"
-                     v-if="formDataCert.Status != 0">
-          <el-card class="box-card mycard">
-            <div slot="header"
-                 class="clearfix">
+        <el-tab-pane label="供方交费"
+                     v-if="formDataCert.Status == 5">
+        </el-tab-pane>
+
+        <el-tab-pane label="企业曾用名" v-if="this.showcy">
+          <el-card class="box-card mycard" >
+            <div slot="header" class="clearfix">
               <span>企业曾用名</span>
             </div>
-             <usednameselect-index ref="usednameselectIndex"
-                              :formData.sync="formData"
-                              :entryinfo="entrydetail"></usednameselect-index>
-            <!-- <usedname-list ref="usednameselectIndex"
-               :data.sync="usednameselectIndex"
-                     @close="getbuslist" 
-                     :canadd="add_flat"
-                     :candelete="delete_flat"
-                     height="360px"
-                     style="margin-top: 20px"
-            >
-              
-            </usedname-list> -->
+            <usednameselect-index ref="usednameselectIndex"
+                                  :formData.sync="formData"
+                                  :entryinfo="entrydetail"></usednameselect-index>
           </el-card>
         </el-tab-pane>
-        <!--<el-tab-pane label="审批历史" v-if="this.formData.AuditIndex > 0 ">-->
-        <!--<el-card class="box-card" style="margin-top: 20px">-->
-        <!--<div slot="header" class="clearfix">-->
-        <!--<span>审批历史</span>-->
-        <!--</div>-->
-        <!--<wf-back-history ref="WfBackHistory" :entryinfo="backhistroy"></wf-back-history>-->
-        <!--</el-card>-->
-        <!--</el-tab-pane>-->
-        <el-tab-pane label="供方交费"
-                     v-if="formDataCert.Status == 5">
-        </el-tab-pane>
       </el-tabs>
 
       <div style="float: right; margin: 20px;">
@@ -585,7 +566,11 @@ export default {
     })
   },
   name: 'oilsupplierEdit',
-
+  created () {
+    if (this.$route.query.showcy) {
+      this.showcy = true
+    }
+  },
   data () {
     var checkWorkerTotal = (rule, value, callback) => {
       if (value <= 0) {
@@ -609,6 +594,7 @@ export default {
       }
     }
     return {
+      showcy: false,
       firOptions: [],
       loading: false,
       WorkerTotal: 0,