Merge tag 'Hotfix-mo-122' into develop

Finish Hotfix-mo-122

# Conflicts:
#	src/views/supply/engin/components/engin_form.vue

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

@@ -61,9 +61,7 @@
             <el-select v-model="mainForm.machineType" placeholder="选择机型类别" size="small" clearable style="width: 100%">
               <el-option
                 v-for="item in machineTypeList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+                :key="item.dictCode" :label="item.dictValue" :value="item.dictCode">
               </el-option>
             </el-select>
           </el-form-item>
@@ -110,9 +108,7 @@
             <el-select v-model="mainForm.loginType" placeholder="选择工程登录类型" size="small" clearable style="width: 100%">
               <el-option
                 v-for="item in loginTypeList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+                :key="item.dictCode" :label="item.dictValue" :value="item.dictCode">
               </el-option>
             </el-select>
           </el-form-item>
@@ -137,14 +133,12 @@
             <el-input v-model="mainForm.greeRemark" placeholder="请输入格力内部备注"></el-input>
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :sm="12" :lg="8">
+        <el-col :xs="24" :sm="12" :lg="8" v-if="!isDealer">
           <el-form-item label="权限分类" prop="power">
             <el-select v-model="mainForm.power" placeholder="选择权限分类" size="small" clearable style="width: 100%">
               <el-option
                 v-for="item in powerList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+                :key="item.dictCode" :label="item.dictValue" :value="item.dictCode">
               </el-option>
             </el-select>
           </el-form-item>
@@ -427,6 +421,12 @@ export default {
     }
   },
 
+  computed: {
+    isDealer() {
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+    },
+  },
+
   async created() {
     await this.getSalesmanList();
     this.getDictList();
@@ -517,6 +517,15 @@ export default {
       getDictList({sysDictEnum: 'PRODUCT_TYPE'}).then(res => {
         this.typeList = res.data;
       })
+      getDictList({sysDictEnum: 'MACHINE_TYPE'}).then(res => {
+        this.machineTypeList = res.data;
+      })
+      getDictList({sysDictEnum: 'POWER_CATEGORY'}).then(res => {
+        this.powerList = res.data;
+      })
+      getDictList({sysDictEnum: 'SIGN_TYPE'}).then(res => {
+        this.loginTypeList = res.data;
+      })
     },
 
     // 获取销售类型列表