Finish Hotfix-zh-135

src/views/basic_data/material/price_list.vue

@@ -302,7 +302,7 @@
           />
           <el-table-column
             align="left"
-            label="是否促销价"
+            label="是否销价"
             prop="isPromote"
             min-width="160"
             show-overflow-tooltip
@@ -314,7 +314,7 @@
           </el-table-column>
           <el-table-column
             align="left"
-            label="是否促作废"
+            label="是否作废"
             prop="isRevoke"
             min-width="160"
             show-overflow-tooltip

src/views/supply/apply/components/engin_form.vue

@@ -61,12 +61,12 @@
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="工程登录类型" prop="loginType">
-            <el-input v-model="mainForm.loginType" placeholder="请输入工程登录类型" :disabled="isDealer"></el-input>
+            <el-input v-model="mainForm.loginType" placeholder="请输入工程登录类型" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">
           <el-form-item label="跨厂区编号" prop="factoryNum">
-            <el-input v-model="mainForm.factoryNum" placeholder="请输入跨厂区编号" :disabled="isDealer"></el-input>
+            <el-input v-model="mainForm.factoryNum" placeholder="请输入跨厂区编号" disabled></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="12" :lg="8">