已入库选择供应商

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

@@ -20,7 +20,7 @@
                 element-loading-text="正在更改请稍后..."
                 border
                 size="mini"
-                height="calc(100vh - 435px)"
+                height="calc(100vh - 445px)"
                 @selection-change="handleSelectionChange">
         <el-table-column type="selection"
                          width="55">
@@ -42,7 +42,6 @@
         </el-table-column>
         <el-table-column label="是否为制造商" width="100">
           <template slot-scope="scope">
-            {{operType != '制造商'}}{{!(canadd || newcanadd)}}{{(operType != '制造商')&& !(canadd || newcanadd)}}
             <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 2" @click="type_change(scope,canadd,newcanadd)" :disabled="isDisabledBtn()">非制造商</el-button>
             <el-button type="primary" plain size="mini" v-if="scope.row.IsManufacturer == 1" @click="type_change(scope,canadd,newcanadd)" :disabled="isDisabledBtn()">制造商</el-button>
           </template>

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

@@ -179,7 +179,8 @@
         </el-tab-pane>
 
         <el-tab-pane label="准入范围" :disabled="!certId">
-          <goods-list ref="goodsList" :data.sync="goodsList" @close="getbuslist" :canadd="add_flat" :newcanadd="newadd_flat" height="360px"
+          <goods-list ref="goodsList" :data.sync="goodsList" @close="getbuslist" :canadd="add_flat" :newcanadd="newadd_flat"
+                      :operType="formData.OperType" height="360px"
             style="margin-top: 20px" :candelete="delete_flat"></goods-list>
         </el-tab-pane>
         <el-tab-pane label="企业资质" :disabled="!certId">