diff --git a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue
index 95888226e7..32399489c5 100644
--- a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangAdd.vue
@@ -16,7 +16,7 @@
           </div>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>厂商名称</span>
+              <span><span class="icon">*</span>供应商名称</span>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="manufacturerName">
@@ -38,7 +38,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item>
-                <el-input v-model="baseManufacturerDto.manufacturerCode" maxlength="20" placeholder="" class="addinputw" clearable/>
+                <el-input v-model="baseManufacturerDto.manufacturerCode" :disabled="!isShow" maxlength="20" placeholder="" class="addinputw" clearable/>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
@@ -64,7 +64,7 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>厂商办公电话</span>
+              <span><span class="icon">*</span>供应商办公电话</span>
             </el-col>
             <el-col :span="8">
               <el-form-item prop="manufacturerTelePhone">
@@ -214,6 +214,7 @@ export default {
       viewTitle: '',
       dialogStatus: '',
       sid: '',
+      isShow: true,
       supplierType_list: [],
       baseManufacturerDto: {
         manufacturerName: '',
@@ -237,7 +238,7 @@ export default {
       rules: {
         manufacturerName: [{
           required: true,
-          message: '请填写厂商名称',
+          message: '请填写供应商名称',
           trigger: 'blur'
         }],
         supplierTypeValue: [{
@@ -247,7 +248,7 @@ export default {
         }],
         manufacturerAddress: [{
           required: true,
-          message: '请填写厂商通讯地址',
+          message: '请填写供应商通讯地址',
           trigger: 'blur'
         }],
         manufacturerTelePhone: [{
@@ -363,6 +364,7 @@ export default {
         this.$refs['form_obj'].clearValidate()
       })
       this.dialogStatus = 'edit'
+      this.isShow = row.isShow
       req.fetchBySid(row.sid).then(resp => {
         this.sid = row.sid
         this.baseManufacturerDto = resp.data.baseManufacturerDto
diff --git a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangByHosts.vue b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangByHosts.vue
index 00a3270723..cdf60686ae 100644
--- a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangByHosts.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangByHosts.vue
@@ -16,7 +16,7 @@
           </div>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>厂商名称</span>
+              <span><span class="icon">*</span>供应商名称</span>
             </el-col>
             <el-col :span="8">
               <el-form-item>
@@ -62,7 +62,7 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>厂商办公电话</span>
+              <span><span class="icon">*</span>供应商办公电话</span>
             </el-col>
             <el-col :span="8">
               <el-form-item>
diff --git a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangInfo.vue b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangInfo.vue
index 5793347a26..b44b7d6bdc 100644
--- a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshangInfo.vue
@@ -14,7 +14,7 @@
           </div>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>厂商名称</span>
+              <span><span class="icon">*</span>供应商名称</span>
             </el-col>
             <el-col :span="8">
               <el-form-item>
@@ -60,7 +60,7 @@
           </el-row>
           <el-row>
             <el-col :span="4" class="tleftb">
-              <span><span class="icon">*</span>厂商办公电话</span>
+              <span><span class="icon">*</span>供应商办公电话</span>
             </el-col>
             <el-col :span="8">
               <el-form-item>
diff --git a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue
index 0d36fc5b76..8812f885fc 100644
--- a/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/gongyingshang/gongyingshanggaunli.vue
@@ -39,7 +39,7 @@
             <el-table-column label="序号" fixed type="index" width="80" :index="indexMethod" align="center"/>
             <el-table-column label="操作" fixed align="center" width="90px" class-name="small-padding fixed-width">
               <template slot-scope="{row}">
-                <el-button size="mini" type="primary" :disabled="!row.isShow" @click="handleEdit(row)">编辑</el-button>
+                <el-button size="mini" type="primary" :disabled="!row.isShow && (row.supplierTypeValue === '主机厂' || row.supplierTypeValue === '分公司')" @click="handleEdit(row)">编辑</el-button>
               </template>
             </el-table-column>
             <el-table-column prop="jc" label="供应商名称" width="220" header-align="center" align="left">
@@ -82,7 +82,7 @@
     </div>
     <gongyingshangAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="handleFilter"/>
     <gongyingshangInfo v-show="viewState == 4" ref="divinfo" @doback="resetState"/>
-    <gongyingshangByHosts v-show="5" ref="divHosts" @doback="resetState" @reloadlist="handleFilter"/>
+    <gongyingshangByHosts v-show="viewState == 5" ref="divHosts" @doback="resetState" @reloadlist="handleFilter"/>
   </div>
 </template>