Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system-vue

src/utils/dict.js

@@ -196,6 +196,8 @@ export const DICT_TYPE = {
   REPAIR_SO_STATUS: 'repair_so_status',
   // 维修旧件处理方式
   REPAIR_PART_DISPOSAL: 'repair_part_disposal',
+  //单位
+  REPAIR_UNIT: 'repair_unit',
 }
 
 /**

src/views/repair/project/form/RepairProjectForm.vue

@@ -19,12 +19,12 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="成本" prop="cost">
-              <el-input v-model="formData.cost" placeholder="请输入成本"/>
+              <el-input-number v-model="formData.cost" :precision="2" :step="0.1" :max="10"></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="售价" prop="price">
-              <el-input v-model="formData.price" placeholder="请输入售价"/>
+              <el-input-number v-model="formData.price" :precision="2" :step="0.1" :max="10"></el-input-number>
             </el-form-item>
           </el-col>
         </el-row>
@@ -37,7 +37,10 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="单位" prop="unit">
-              <el-input v-model="formData.unit" placeholder="请输入单位"/>
+              <el-select v-model="formData.unit" placeholder="请选择单位">
+                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.REPAIR_UNIT)"
+                           :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -45,9 +48,12 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="分类" prop="type">
-              <el-select v-model="formData.type" placeholder="请选择分类">
+              <TreeSelect
-                <el-option label="请选择字典生成" value=""/>
+                v-model="formData.type"
-              </el-select>
+                :options="baseTypeTree"
+                :normalizer="normalizer"
+                placeholder="请选择分类"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -60,12 +66,24 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="是否自助" prop="isSelf">
-              <el-input v-model="formData.isSelf" placeholder="请输入是否自助"/>
+              <el-switch
+                v-model="formData.isSelf"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                active-value="1"
+                inactive-value="0">
+              </el-switch>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="分店公用" prop="isPublic">
-              <el-input v-model="formData.isPublic" placeholder="请输入是否允许分店公用此产品"/>
+              <el-switch
+                v-model="formData.isPublic"
+                active-color="#13ce66"
+                inactive-color="#ff4949"
+                active-value="1"
+                inactive-value="0">
+              </el-switch>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -85,10 +103,12 @@
 
 <script>
 import * as RepairProjectApi from '@/api/repair/project';
-
+import * as BaseTypeApi from '@/api/base/type';
+import TreeSelect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "RepairProjectForm",
-  components: {},
+  components: {TreeSelect},
   data() {
     return {
       // 弹出层标题
@@ -109,13 +129,19 @@ export default {
         type: undefined,
         manHour: undefined,
         isSelf: undefined,
-        isPublic: undefined,
+        isPublic: '0',
-        remark: undefined,
+        remark: '0',
         corpId:'',
         corpIds:[],
       },
       // 表单校验
-      formRules: {},
+      formRules: {
+        // name: [{required: true, message: '项目名称不能为空', trigger: 'blur'}],
+        // code: [{required: true, message: '编码不能为空', trigger: 'blur'}],
+        // type: [{required: true, message: '分类不能为空', trigger: 'blur'}],
+        // unit: [{required: true, message: '单位不能为空', trigger: 'blur'}],
+      },
+      baseTypeTree:[],
     };
   },
   methods: {
@@ -135,7 +161,33 @@ export default {
         }
       }
       this.title = "新增维修项目";
+      //获取类型树
+      await this.getBaseTypeTree();
     },
+    /** 获得配置类型树 */
+    async getBaseTypeTree() {
+      this.baseTypeTree = [];
+      let param = {
+        type:'02'
+      }
+      const res = await BaseTypeApi.getBaseTypeList(param);
+      const root = {id: 0, name: '顶级配置类型', children: []};
+      root.children = this.handleTree(res.data, 'id', 'parentId',"children","0")
+      this.baseTypeTree.push(root)
+    },
+
+    /** 转换配置类型数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      };
+    },
+
     /** 提交按钮 */
     async submitForm() {
       // 校验主表
@@ -173,8 +225,8 @@ export default {
         type: undefined,
         manHour: undefined,
         isSelf: undefined,
-        isPublic: undefined,
+        isPublic: '0',
-        remark: undefined,
+        remark: '0',
         corpId:'',
         corpIds:[],
       };

src/views/repair/project/index.vue

@@ -39,8 +39,12 @@
       <el-table-column label="规格" align="center" prop="spec"/>
       <el-table-column label="售价" align="center" prop="price"/>
       <el-table-column label="编码" align="center" prop="code"/>
-      <el-table-column label="单位" align="center" prop="unit"/>
+      <el-table-column label="单位" align="center" prop="unit">
-      <el-table-column label="分类" align="center" prop="type"/>
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.REPAIR_UNIT" :value="scope.row.unit" />
+        </template>
+      </el-table-column>
+      <el-table-column label="分类" align="center" prop="typeName"/>
       <el-table-column label="工时" align="center" prop="manHour"/>
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="创建时间" align="center" prop="createTime" width="180">