Merge branch 'xiaozy_产品列表' of http://121.196.213.68:3000/xiaozhiyong/refinery-admin into xiaozy_产品列表

src/views/customerManagement/companyManagement/OilCompanyInfoAdd.vue

@@ -49,10 +49,6 @@
           <el-col :span="12">
             <el-form-item label="账户类型" prop="companyType">
               <el-select v-model="oilCompanyInfo.companyType" placeholder="请选择">
-                <el-option label="柴油账户" :value="0" />
-                <el-option label="LNG账户" :value="2" />
-                <el-option label="汽油账户" :value="1" />
-                <el-option label="尿素账户" :value="3" />
                 <el-option label="油批账户" :value="4" />
               </el-select>
             </el-form-item>
@@ -124,7 +120,7 @@ export default {
         parentMark: 0,
         parentId: undefined,
         companyNature: 0,
-        companyType:0,
+        companyType: 4,
         createSource: 'WEBM',
         enableMark: 1,
         auditMark: 0

src/views/customerManagement/companyManagement/OilCompanyInfoUpdate.vue

@@ -49,10 +49,6 @@
           <el-col :span="12">
             <el-form-item label="账户类型" prop="companyType">
               <el-select v-model="updateOilCompanyInfo.companyType" :disabled="updateOilCompanyInfo.auditMark === 1 ? true : false" placeholder="请选择">
-                <el-option label="柴油账户" value="0" />
-                <el-option label="LNG账户" value="2" />
-                <el-option label="汽油账户" value="1" />
-                <el-option label="尿素账户" value="3" />
                 <el-option label="油批账户" value="4" />
               </el-select>
             </el-form-item>

src/views/customerManagement/companyManagement/index.vue

@@ -738,6 +738,7 @@ export default {
       });
     },
     getByPage() {
+      this.parameter.params.companyType = "4";
       oilCompanyInfoApi.getByPage(this.parameter).then((res) => {
         this.dataPage.list = res.data.list;
         this.parameter.total = res.data.totalCount;