Merge branch 'demo_' of http://123.60.19.203:8088/hitch/hitch-antd

public/ueditor/third-party/webuploader/webuploader.custom.js

@@ -2,7 +2,7 @@
 
 
 /**
- * @fileOverview 让内部各个部件的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
+ * @fileOverview 让内部各个部位的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
  *
  * AMD API 内部的简单不完全实现，请忽略。只有当WebUploader被合并成一个文件的时候才会引入。
  */

public/ueditor/third-party/webuploader/webuploader.flashonly.js

@@ -2,7 +2,7 @@
 
 
 /**
- * @fileOverview 让内部各个部件的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
+ * @fileOverview 让内部各个部位的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
  *
  * AMD API 内部的简单不完全实现，请忽略。只有当WebUploader被合并成一个文件的时候才会引入。
  */

public/ueditor/third-party/webuploader/webuploader.html5only.js

@@ -2,7 +2,7 @@
 
 
 /**
- * @fileOverview 让内部各个部件的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
+ * @fileOverview 让内部各个部位的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
  *
  * AMD API 内部的简单不完全实现，请忽略。只有当WebUploader被合并成一个文件的时候才会引入。
  */

public/ueditor/third-party/webuploader/webuploader.js

@@ -2,7 +2,7 @@
 
 
 /**
- * @fileOverview 让内部各个部件的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
+ * @fileOverview 让内部各个部位的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
  *
  * AMD API 内部的简单不完全实现，请忽略。只有当WebUploader被合并成一个文件的时候才会引入。
  */

public/ueditor/third-party/webuploader/webuploader.withoutimage.js

@@ -2,7 +2,7 @@
 
 
 /**
- * @fileOverview 让内部各个部件的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
+ * @fileOverview 让内部各个部位的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
  *
  * AMD API 内部的简单不完全实现，请忽略。只有当WebUploader被合并成一个文件的时候才会引入。
  */

src/api/excel/excel.js

@@ -0,0 +1,20 @@
+import { axios } from '@/utils/request'
+import { stringify } from 'qs'
+
+/**
+ * add batch func
+ * parameter: { }
+ * @param parameter
+ * @returns {*}
+ */
+export function importExcel (parameter) {
+  return axios({
+    url: '/excel/import',
+    method: 'POST',
+    headers: {
+      'Accept': 'application/json',
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
+    data: parameter
+  })
+}

src/assets/static/ueditor/third-party/webuploader/webuploader.custom.js

@@ -2,7 +2,7 @@
 
 
 /**
- * @fileOverview 让内部各个部件的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
+ * @fileOverview 让内部各个部位的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
  *
  * AMD API 内部的简单不完全实现，请忽略。只有当WebUploader被合并成一个文件的时候才会引入。
  */

src/assets/static/ueditor/third-party/webuploader/webuploader.flashonly.js

@@ -2,7 +2,7 @@
 
 
 /**
- * @fileOverview 让内部各个部件的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
+ * @fileOverview 让内部各个部位的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
  *
  * AMD API 内部的简单不完全实现，请忽略。只有当WebUploader被合并成一个文件的时候才会引入。
  */

src/assets/static/ueditor/third-party/webuploader/webuploader.html5only.js

@@ -2,7 +2,7 @@
 
 
 /**
- * @fileOverview 让内部各个部件的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
+ * @fileOverview 让内部各个部位的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
  *
  * AMD API 内部的简单不完全实现，请忽略。只有当WebUploader被合并成一个文件的时候才会引入。
  */

src/assets/static/ueditor/third-party/webuploader/webuploader.js

@@ -2,7 +2,7 @@
 
 
 /**
- * @fileOverview 让内部各个部件的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
+ * @fileOverview 让内部各个部位的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
  *
  * AMD API 内部的简单不完全实现，请忽略。只有当WebUploader被合并成一个文件的时候才会引入。
  */

src/assets/static/ueditor/third-party/webuploader/webuploader.withoutimage.js

@@ -2,7 +2,7 @@
 
 
 /**
- * @fileOverview 让内部各个部件的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
+ * @fileOverview 让内部各个部位的代码可以用[amd](https://github.com/amdjs/amdjs-api/wiki/AMD)模块定义方式组织起来。
  *
  * AMD API 内部的简单不完全实现，请忽略。只有当WebUploader被合并成一个文件的时候才会引入。
  */

src/router/generator-platform-routers.js

@@ -69,11 +69,11 @@ const constantRouterComponents = {
   'SbModelSpareListBom': () => import('@/views/sb/modelbom/SbModelSpareListBom'),
   // 设备树
   'SbInfoTree': () => import('@/views/sb/info/SbInfoTree'),
-  // 部件类别
+  // 部位类别
   'PartType': () => import('@/views/part/type/PartType'),
-  // 部件信息
+  // 部位信息
   'PartInfo': () => import('@/views/part/info/PartInfo'),
-  // 部件信息
+  // 部位信息
   'SbInfoForPartInfo': () => import('@/views/sb/info/SbInfoForPartInfo'),
   // 备件类别
   'SpareType': () => import('@/views/sqarepartmanage/sparetype/SpareType'),
@@ -289,8 +289,6 @@ const constantRouterComponents = {
   'SbInfoScrap': () => import('@/views/sb/scrap/SbInfoScrap'),
   // 设备维护标准
   'SbInfoStandard': () => import('@/views/sb/info/SbInfoStandard'),
-  // 导入
-  'Imp': () => import('@/views/upms/impExcel/Imp'),
 
   // 报表
   'AnalysisSbInfo': () => import('@/views/dashboard/AnalysisSbInfo'), // 保养任务完成率报表
@@ -311,7 +309,10 @@ const constantRouterComponents = {
   'CustomFieldTemplate': () => import('@/views/customize/fieldTemplate/CustomFieldTemplate'), // 自定义模板
   'CustomFieldTemplateData': () => import('@/views/customize/fieldTemplateData/CustomFieldTemplateData'), // 自定义模板数据
   // 新增路由
-  'SparePartUsedSelectTable': () => import('@/views/sqarepartmanage/sparepartused/modules/SparePartUsedSelectTable') // 备件使用记录
+  'SparePartUsedSelectTable': () => import('@/views/sqarepartmanage/sparepartused/modules/SparePartUsedSelectTable'), // 备件使用记录
+  // 初始化导入
+  'ImportExcel': () => import('@/views/excel/ImportExcel')
+
 }
 
 // 前端未找到页面路由（固定不用改）

src/utils/dict.js

@@ -104,8 +104,8 @@ DictCache.TYPE = {
   SB_IS_SHOW: 'SB_IS_SHOW', // 自定义类型
   SB_IS_FINANCING: 'SB_IS_FINANCING', // 是否固定资产
   PRODUCER_AREA: 'PRODUCER_AREA', // 产地
-  PART_LEVEL: 'PART_LEVEL', // 部件等级
-  PART_STATUS: 'PART_STATUS', // 部件状态
+  PART_LEVEL: 'PART_LEVEL', // 部位等级
+  PART_STATUS: 'PART_STATUS', // 部位状态
   SPARE_PART_INFO_LEVEL: 'SPARE_PART_INFO_LEVEL', // 备件等级
   SPARE_USE_TYPE: 'SPARE_USE_TYPE', // 备件使用用途
   SPARE_PART_USED_STATUS: 'SPARE_PART_USED_STATUS', // 备件使用状态
@@ -454,7 +454,7 @@ DictCache.VALUE = {
   },
 
   /**
-   * 设备类型/部件類型/备件类型
+   * 设备类型/部位類型/备件类型
    */
   SBTYPE_TYPE: {
     BIG: 1, // 大类
@@ -640,7 +640,7 @@ DictCache.VALUE = {
     GE: 4 // 个
   },
   /**
-   * 部件等級
+   * 部位等級
    */
   PART_LEVEL: {
     A: 1, // 一级
@@ -648,7 +648,7 @@ DictCache.VALUE = {
     C: 3 // 三级
   },
   /**
-   * 部件状态
+   * 部位状态
    */
   PART_STATUS: {
     IN_USE: 1, // 正在使用
@@ -710,7 +710,7 @@ DictCache.VALUE = {
    */
   OPERATE_OBJECT_TYPE: {
     SB: 1, // 设备
-    PART: 2 // 部件
+    PART: 2 // 部位
   },
   /**
    * 仓库位置类型
@@ -879,7 +879,7 @@ DictCache.VALUE = {
    */
   REPAIR_FEE_TYPE: {
     SB_FEE: 1, // 设备费用
-    PART_FEE: 2 // 部件费用
+    PART_FEE: 2 // 部位费用
   },
   /* 点巡检模块 */
   /**

src/views/check/checkjob/CheckJob.vue

@@ -337,7 +337,7 @@ export default {
         },
 
         // {
-        // title: '负责部件',
+        // title: '负责部位',
         // dataIndex: 'partName',
         // checked: true
         // },

src/views/check/checkjob/modules/BaseForm.vue

@@ -20,9 +20,9 @@
         <a-input
           v-decorator="['sbId', {rules: [{required: true, message: '设备id不能为空'}]}]"/>
       </a-form-item>
-      <a-form-item label="部件id" v-show="false">
+      <a-form-item label="部位id" v-show="false">
         <a-input
-          v-decorator="['partId', {rules: [{required: false, message: '部件id不能为空'}]}]"/>
+          v-decorator="['partId', {rules: [{required: false, message: '部位id不能为空'}]}]"/>
       </a-form-item>-->
       <a-form-item label="标准id" v-show="false">
         <a-input

src/views/check/checkjob/modules/CheckJobTableWaitDo.vue

@@ -194,7 +194,7 @@ export default {
           checked: true
         },
         // {
-        // title: '点检部件',
+        // title: '点检部位',
         // dataIndex: 'partName',
         // checked: true
         // },

src/views/check/checkproject/CheckProject.vue

@@ -130,7 +130,7 @@ export default {
           dataIndex: 'sbName'
         },
         {
-          title: '部件编码',
+          title: '部位编码',
           dataIndex: 'partNo'
         },
         {

src/views/check/checkproject/modules/AddForm.vue

@@ -108,18 +108,18 @@
 
         <row-item>
           <a-form-item
-            label="部件id"
+            label="部位id"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
             v-show="false"
           >
             <a-input
-              v-decorator="['partId', {rules: [{required: false, message: '部件id不能为空'}]}]"/>
+              v-decorator="['partId', {rules: [{required: false, message: '部位id不能为空'}]}]"/>
           </a-form-item>
         </row-item>
         <row-item>
           <a-form-item
-            label="部件编码"
+            label="部位编码"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
             v-show="showPart"
@@ -127,21 +127,21 @@
             <a-input
               disabled
               style="width: 80%"
-              v-decorator="['partNo', {rules: [{required: false, message: '部件id不能为空'}]}]"/>
+              v-decorator="['partNo', {rules: [{required: false, message: '部位id不能为空'}]}]"/>
             <a-button type="primary" style="width: 20%" @click="handlePartSelect">选择</a-button>
           </a-form-item>
         </row-item>
 
         <row-item>
           <a-form-item
-            label="部件名称"
+            label="部位名称"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
             v-show="showPart"
           >
             <a-input
               disabled
-              v-decorator="['partName', {rules: [{required: false, message: '部件id不能为空'}]}]"/>
+              v-decorator="['partName', {rules: [{required: false, message: '部位id不能为空'}]}]"/>
           </a-form-item>
         </row-item>
         <row-item>

src/views/check/checkproject/modules/BaseForm.vue

@@ -107,18 +107,18 @@
 
         <row-item>
           <a-form-item
-            label="部件id"
+            label="部位id"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
             v-show="false"
           >
             <a-input
-              v-decorator="['partId', {rules: [{required: false, message: '部件id不能为空'}]}]"/>
+              v-decorator="['partId', {rules: [{required: false, message: '部位id不能为空'}]}]"/>
           </a-form-item>
         </row-item>
         <row-item>
           <a-form-item
-            label="部件编码"
+            label="部位编码"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
             v-show="showPart"
@@ -126,21 +126,21 @@
             <a-input
               disabled
               style="width: 80%"
-              v-decorator="['partNo', {rules: [{required: false, message: '部件id不能为空'}]}]"/>
+              v-decorator="['partNo', {rules: [{required: false, message: '部位id不能为空'}]}]"/>
             <a-button type="primary" style="width: 20%" @click="handlePartSelect">选择</a-button>
           </a-form-item>
         </row-item>
 
         <row-item>
           <a-form-item
-            label="部件名称"
+            label="部位名称"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
             v-show="showPart"
           >
             <a-input
               disabled
-              v-decorator="['partName', {rules: [{required: false, message: '部件id不能为空'}]}]"/>
+              v-decorator="['partName', {rules: [{required: false, message: '部位id不能为空'}]}]"/>
           </a-form-item>
         </row-item>
         <row-item>

src/views/check/checkproject/modules/CheckProjectSelectModal.vue

@@ -121,7 +121,7 @@ export default {
           dataIndex: 'sbName'
         },
         {
-          title: '部件编码',
+          title: '部位编码',
           dataIndex: 'partNo'
         },
         {

src/views/check/checkproject/modules/Detail.vue

@@ -11,8 +11,8 @@
       <detail-list-item term="设备编号">{{ model.sbNo }}</detail-list-item>
       <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
       <detail-list-item term="设备型号">{{ model.sbType }}</detail-list-item>
-      <detail-list-item term="部件编号">{{ model.partNo }}</detail-list-item>
-      <detail-list-item term="部件名称">{{ model.partName }}</detail-list-item>
+      <detail-list-item term="部位编号">{{ model.partNo }}</detail-list-item>
+      <detail-list-item term="部位名称">{{ model.partName }}</detail-list-item>
       <detail-list-item term="项目名称">{{ model.name }}</detail-list-item>
       <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>
       <detail-list-item term="更新人">{{ model.updateUserName }}</detail-list-item>

src/views/dashboard/modules/DetailCheckJobReport.vue

@@ -128,7 +128,7 @@ export default {
         },
 
         // {
-        // title: '负责部件',
+        // title: '负责部位',
         // dataIndex: 'partName',
         // checked: true
         // },

src/views/excel/ImportExcel.vue

@@ -0,0 +1,51 @@
+<template>
+  <a-card :bordered="false" v-show="visible" class="card" :title="modalTitle">
+    <h1 style="margin:20px auto; text-align: center"> 初始化导入 </h1>
+    <a-card title="导入列表">
+      <a-card-grid v-for="(name, index) in names" :key="name" style="width:25%;text-align:center" @click="doImport(index)">
+        {{ name }}
+      </a-card-grid>
+    </a-card>
+    <import-form-add ref="importModal"/>
+  </a-card>
+</template>
+
+<script>
+import ImportFormAdd from './modules/ImportFormAdd'
+export default {
+  name: 'ImportExcel',
+  components: {
+    ImportFormAdd
+  },
+  data () {
+    return {
+      confirmLoading: false,
+      modalTitle: null,
+      configMap: {},
+      names: ['部位类型', '设备类型', '设备位置', '生产商', '设备台账'],
+      factoryStr: null,
+      form: this.$form.createForm(this),
+      visible: true,
+      user: this.$store.getters.userInfo
+    }
+  },
+  props: {
+  },
+  created () {
+  },
+  methods: {
+    base (record) {
+      this.visible = true
+      // 如果是空标识添加
+      if (this.BaseTool.Object.isBlank(record)) {
+        this.modalTitle = '导入'
+        this.data = []
+      }
+    },
+    doImport (index) {
+      console.log(index)
+      this.$refs.importModal.base(index)
+    }
+  }
+}
+</script>

src/views/excel/modules/ImportFormAdd.vue

@@ -0,0 +1,113 @@
+<template>
+  <a-modal
+    :title="modalTitle"
+    :width="640"
+    :visible="visible"
+    :confirmLoading="confirmLoading"
+    @cancel="handleCancel"
+  >
+    <a-form :form="form">
+      <a-form-item
+        label="上传文件"
+        :labelCol="BaseTool.Constant.labelCol"
+        :wrapperCol="BaseTool.Constant.wrapperCol"
+      >
+        <a-upload :fileList="fileList" @change="handleChange" :remove="handleRemove" :beforeUpload="beforeUpload">
+          <a-button> <a-icon type="upload" />选择上传文件</a-button>
+        </a-upload>
+      </a-form-item>
+    </a-form>
+    <!--    <p style="color: red">注意事项：<br/>
+      1：请确保设备新号、名称、型号的准确填写<br/>
+      2：请确保数据都未导入，重新导入成功不会覆盖原有数据，导致存在多台同样设备<br/>
+      3：导入如出现问题，请及时联系<br/>
+    </p>-->
+    <template slot="footer">
+      <a-button :loading="confirmLoading" type="primary" @click="save()">确定</a-button>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+import { importExcel } from '@/api/excel/excel'
+
+export default {
+  name: 'SbModelBomImportForm',
+  data () {
+    return {
+      confirmLoading: false,
+      modalTitle: null,
+      form: this.$form.createForm(this),
+      visible: false,
+      type: null,
+      fileList: []
+    }
+  },
+  methods: {
+    base (type) {
+      this.visible = true
+      this.type = type
+      this.modalTitle = '初始化导入'
+    },
+    handleRemove (file) {
+      const index = this.fileList.indexOf(file)
+      const newFileList = this.fileList.slice()
+      newFileList.splice(index, 1)
+      this.fileList = newFileList
+    },
+    beforeUpload (file) {
+      const reg = /\.(xls|xlsx)(\?.*)?$/
+      return new Promise((resolve, reject) => {
+        if (reg.test(file.name)) {
+          this.fileList = [file]
+          return false
+        } else {
+          this.$message.error(`请上传正确的excel文件`)
+          reject(new Error('请上传正确的excel文件'))
+          return false
+        }
+      })
+    },
+    handleChange (info) {
+      if (info.file.status !== 'uploading') {
+        console.log(info.file, info.fileList)
+      }
+      if (info.file.status === 'done') {
+        this.$message.success(`${info.file.name} file uploaded successfully`)
+      } else if (info.file.status === 'error') {
+        this.$message.error(`${info.file.name} file upload failed.`)
+      }
+    },
+    save () {
+      const { form: { validateFieldsAndScroll } } = this
+      this.confirmLoading = true
+      validateFieldsAndScroll((errors, values) => {
+        if (errors) {
+          this.confirmLoading = false
+          return
+        }
+        const formData = new FormData()
+        formData.append('type', this.type)
+        formData.append('file', this.fileList[0])
+        importExcel(formData)
+          .then((res) => {
+            this.$message.info(res.data)
+            this.handleCancel(values)
+            this.BaseTool.ListForm.clearOneList(this)
+            this.BaseTool.ListForm.pushOneListAddMore(this, res.data)
+          }).catch(() => {
+            this.confirmLoading = false
+          })
+      })
+    },
+    handleCancel (values) {
+      this.visible = false
+      this.confirmLoading = false
+      this.fileList = []
+      this.form.resetFields()
+      this.storeId = null
+    }
+
+  }
+}
+</script>

src/views/firm/supplier/modules/BaseForm.vue

@@ -17,7 +17,7 @@
         <row-item>
 
           <a-form-item
-            label="类型：1.表示设备，2.表示部件，3.表示备件"
+            label="类型：1.表示设备，2.表示部位，3.表示备件"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >

src/views/firm/supplier/modules/Detail.vue

@@ -8,7 +8,7 @@
     @cancel="handleCancel"
   >
     <detail-list title="" :col="2">
-      <detail-list-item term="类型：1.表示设备，2.表示部件，3.表示备件">{{ model.type }}</detail-list-item>
+      <detail-list-item term="类型：1.表示设备，2.表示部位，3.表示备件">{{ model.type }}</detail-list-item>
       <detail-list-item term="编码">{{ model.no }}</detail-list-item>
       <detail-list-item term="名称">{{ model.name }}</detail-list-item>
       <detail-list-item term="等级">{{ BaseTool.Object.getField(levelMap,model.level) }}</detail-list-item>

src/views/firm/supplier/modules/FirmSupplierSelectModal.vue

@@ -113,7 +113,7 @@ export default {
           }
         },
         {
-          title: '类型：1.表示设备，2.表示部件，3.表示备件',
+          title: '类型：1.表示设备，2.表示部位，3.表示备件',
           dataIndex: 'type'
         },
         {

src/views/part/info/PartInfo.vue

@@ -111,22 +111,22 @@ export default {
           }
         },
         {
-          title: '部件编号',
+          title: '部位编号',
           dataIndex: 'no'
         },
         {
-          title: '部件名称',
+          title: '部位名称',
           dataIndex: 'name'
         },
         {
-          title: '部件类别',
+          title: '部位类别',
           dataIndex: 'typeId',
           customRender: (text, record, index) => {
             return record.typeName
           }
         },
         {
-          title: '部件等级',
+          title: '部位等级',
           dataIndex: 'level',
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.levelMap, text)

src/views/part/info/modules/BaseForm.vue

@@ -17,18 +17,18 @@
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="部件编号"
+            label="部位编号"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
               disabled
-              v-decorator="['no', {rules: [{required: false, message: '部件编号不能为空'}]}]" />
+              v-decorator="['no', {rules: [{required: false, message: '部位编号不能为空'}]}]" />
           </a-form-item>
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="部件名称"
+            label="部位名称"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -40,7 +40,7 @@
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="部件类型"
+            label="部位类型"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
@@ -58,7 +58,7 @@
         </a-col>
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
-            label="部件等级"
+            label="部位等级"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >

src/views/part/info/modules/Detail.vue

@@ -8,10 +8,10 @@
     @cancel="handleCancel"
   >
     <detail-list title="" :col="2">
-      <detail-list-item term="部件编号">{{ model.no }}</detail-list-item>
-      <detail-list-item term="部件名称">{{ model.name }}</detail-list-item>
-      <detail-list-item term="部件类别">{{ model.typeName }}</detail-list-item>
-      <detail-list-item term="部件等级">{{ BaseTool.Object.getField(levelMap,model.level) }}</detail-list-item>
+      <detail-list-item term="部位编号">{{ model.no }}</detail-list-item>
+      <detail-list-item term="部位名称">{{ model.name }}</detail-list-item>
+      <detail-list-item term="部位类别">{{ model.typeName }}</detail-list-item>
+      <detail-list-item term="部位等级">{{ BaseTool.Object.getField(levelMap,model.level) }}</detail-list-item>
       <detail-list-item term="所属设备">{{ model.sbName }}</detail-list-item>
       <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
       <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>

src/views/part/info/modules/PartInfoList.vue

@@ -125,12 +125,12 @@ export default {
           }
         },
         {
-          title: '部件名称',
+          title: '部位名称',
           dataIndex: 'name',
           checked: true
         },
         {
-          title: '部件类别',
+          title: '部位类别',
           dataIndex: 'typeId',
           width: 100,
           checked: true,
@@ -139,7 +139,7 @@ export default {
           }
         },
         {
-          title: '部件等级',
+          title: '部位等级',
           dataIndex: 'level',
           width: 100,
           checked: true,
@@ -227,7 +227,7 @@ export default {
     },
     base (dataParam = {}, queryParam = {}) {
       this.visible = true
-      this.modalTitle = '部件列表'
+      this.modalTitle = '部位列表'
       this.queryParam = queryParam
       this.sbId = queryParam.sbId
       this.dataParam = dataParam

src/views/part/info/modules/PartInfoSelectModal.vue

@@ -115,17 +115,17 @@ export default {
         //   }
         // },
         {
-          title: '部件编号',
+          title: '部位编号',
           dataIndex: 'no',
           width: 300
         },
         {
-          title: '部件名称',
+          title: '部位名称',
           dataIndex: 'name',
           width: 300
         },
         {
-          title: '部件类别',
+          title: '部位类别',
           dataIndex: 'typeId',
           width: 300,
           customRender: (text, record, index) => {
@@ -133,7 +133,7 @@ export default {
           }
         },
         {
-          title: '部件等级',
+          title: '部位等级',
           dataIndex: 'level',
           width: 300,
           customRender: (text, record, index) => {
@@ -251,7 +251,7 @@ export default {
     },
     base (queryParam = {}) {
       this.visible = true
-      this.modalTitle = '选择部件'
+      this.modalTitle = '选择部位'
       this.queryParam = queryParam
       if (this.isCreated) {
         this.$refs.table.clearSelected()

src/views/part/info/modules/PartInfoTable.vue

@@ -136,19 +136,19 @@ export default {
           }
         },
         {
-          title: '部件编号',
+          title: '部位编号',
           checked: true,
           dataIndex: 'no',
           width: 200
         },
         {
-          title: '部件名称',
+          title: '部位名称',
           checked: true,
           dataIndex: 'name'
           // width: 20
         },
         {
-          title: '部件类别',
+          title: '部位类别',
           dataIndex: 'typeId',
           checked: true,
           width: 150,
@@ -157,7 +157,7 @@ export default {
           }
         },
         {
-          title: '部件等级',
+          title: '部位等级',
           dataIndex: 'level',
           width: 150,
           customRender: (text, record, index) => {

src/views/part/type/PartType.vue

@@ -9,7 +9,7 @@
             </a-form-item>
           </a-col>
           <a-col :md="8" :sm="24">
-            <a-form-item label="上层部件类型">
+            <a-form-item label="上层部位类型">
               <a-tree-select
                 style="width: 100%"
                 :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
@@ -113,15 +113,15 @@ export default {
           }
         },
         {
-          title: '部件编码',
+          title: '部位编码',
           dataIndex: 'no'
         },
         {
-          title: '部件名称',
+          title: '部位名称',
           dataIndex: 'name'
         },
         {
-          title: '部件类型',
+          title: '部位类型',
           dataIndex: 'type',
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.partTypeMap, text)
@@ -132,7 +132,7 @@ export default {
           dataIndex: 'sort'
         }, */
         {
-          title: '上层部件',
+          title: '上层部位',
           dataIndex: 'parentId',
           customRender: (text, record, index) => {
             return record.parentName
@@ -277,7 +277,7 @@ export default {
       })
     },
     /**
-     * 设置部件类型树
+     * 设置部位类型树
      */
     setTree (record = {}) {
       fetchPartTypeTree({ id: record.id }).then(res => {

src/views/part/type/modules/BaseForm.vue

@@ -19,7 +19,7 @@
       >
         <a-input
           disabled
-          v-decorator="['no', {rules: [{required: false, message: '部件编码不能为空'}]}]" />
+          v-decorator="['no', {rules: [{required: false, message: '部位编码不能为空'}]}]" />
       </a-form-item>
       <a-form-item
         label="类型名称"
@@ -27,14 +27,14 @@
         :wrapperCol="BaseTool.Constant.wrapperCol"
       >
         <a-input
-          v-decorator="['name', {rules: [{required: true, message: '部件名称不能为空'}]}]" />
+          v-decorator="['name', {rules: [{required: true, message: '部位名称不能为空'}]}]" />
       </a-form-item>
       <a-form-item
         label="类别"
         :labelCol="BaseTool.Constant.labelCol"
         :wrapperCol="BaseTool.Constant.wrapperCol"
       >
-        <a-select @change="handleTypeChange" v-decorator="['type', {initialValue: DictCache.VALUE.SBTYPE_TYPE.SON,rules: [{required: true, message: '部件类型不能为空'}]}]" placeholder="请选择">
+        <a-select @change="handleTypeChange" v-decorator="['type', {initialValue: DictCache.VALUE.SBTYPE_TYPE.SON,rules: [{required: true, message: '部位类型不能为空'}]}]" placeholder="请选择">
           <a-select-option
             v-for="(label,value) in partTypeMap"
             :key="value"
@@ -67,7 +67,7 @@
         </a-select>
       </a-form-item>
       <a-form-item
-        label="上层部件"
+        label="上层部位"
         :labelCol="BaseTool.Constant.labelCol"
         :wrapperCol="BaseTool.Constant.wrapperCol"
         v-show="isShowParent"
@@ -78,7 +78,7 @@
           :treeData="treeData"
           :treeNodeFilterProp="'title'"
           :showSearch="true"
-          v-decorator="['parentId', {rules: [{required: isShowParent, message: '上层部件不能为空'}]}]"
+          v-decorator="['parentId', {rules: [{required: isShowParent, message: '上层部位不能为空'}]}]"
           placeholder="请选择"
         >
         </a-tree-select></a-form-item>

src/views/part/type/modules/Detail.vue

@@ -7,11 +7,11 @@
     @cancel="handleCancel"
   >
     <detail-list title="" :col="2">
-      <detail-list-item term="部件编码">{{ model.no }}</detail-list-item>
-      <detail-list-item term="部件名称">{{ model.name }}</detail-list-item>
-      <detail-list-item term="部件类型">{{ BaseTool.Object.getField(partTypeMap,model.type) }}</detail-list-item>
+      <detail-list-item term="部位编码">{{ model.no }}</detail-list-item>
+      <detail-list-item term="部位名称">{{ model.name }}</detail-list-item>
+      <detail-list-item term="部位类型">{{ BaseTool.Object.getField(partTypeMap,model.type) }}</detail-list-item>
       <detail-list-item term="排序">{{ model.sort }}</detail-list-item>
-      <detail-list-item term="上层部件">{{ model.parentName }}</detail-list-item>
+      <detail-list-item term="上层部位">{{ model.parentName }}</detail-list-item>
       <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
       <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>
       <detail-list-item term="是否删除"><badge :status="DictCache.COLOR.DELFLAG[model.delFlag]" :text="delFlagMap[model.delFlag]"></badge></detail-list-item>

src/views/repair/application-form/modules/Detail.vue

@@ -17,7 +17,7 @@
             <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
             <detail-list-item term="预留维修时间">{{ model.limitHours }}</detail-list-item>
             <detail-list-item term="使用位置">{{ model.sbCph }}</detail-list-item>
-            <!--<detail-list-item term="部件名称">{{ model.partName }}</detail-list-item>-->
+            <!--<detail-list-item term="部位名称">{{ model.partName }}</detail-list-item>-->
             <detail-list-item term="工单类别">{{ BaseTool.Object.getField(planFlagMap,model.category) }}</detail-list-item>
             <!--            <detail-list-item term="是否停机">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>-->
 

src/views/repair/application-form/modules/DetailCheck.vue

@@ -23,7 +23,7 @@
             <detail-list-item term="设备编号">{{ model.sbNo }}</detail-list-item>
             <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
             <detail-list-item term="使用位置">{{ model.sbCph }}</detail-list-item>
-            <!--<detail-list-item term="部件名称">{{ model.partName }}</detail-list-item>-->
+            <!--<detail-list-item term="部位名称">{{ model.partName }}</detail-list-item>-->
             <detail-list-item term="工单类别">{{ BaseTool.Object.getField(planFlagMap,model.category) }}</detail-list-item>
             <!--            <detail-list-item term="是否停机">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>-->
             <detail-list-item term="报修人">{{ model.actualUser }}</detail-list-item>

src/views/repair/application-form/modules/DispatchBaseForm.vue

@@ -21,7 +21,7 @@
         </row-item>
         <!--<row-item>
           <a-form-item
-            label="部件名称"
+            label="部位名称"
             class="marginBottom"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"

src/views/repair/application-form/modules/ImpBaseForm.vue

@@ -36,7 +36,7 @@
         </row-item>
         <!--<row-item>
           <a-form-item
-            label="部件id"
+            label="部位id"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
             v-show="false"
@@ -45,14 +45,14 @@
               v-decorator="['partId', {rules: [{required: false, message: '设备id不能为空'}]}]" />
           </a-form-item>
           <a-form-item
-            label="部件名称"
+            label="部位名称"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-input
               disabled
               style="width: 70%"
-              v-decorator="['partName', {rules: [{required: false, message: '部件名称不能为空'}]}]" />
+              v-decorator="['partName', {rules: [{required: false, message: '部位名称不能为空'}]}]" />
             <a-button :disabled="!BaseTool.Object.isNotBlank(this.form.getFieldValue('sbId'))" style="width: 30%" type="primary" @click="handlePartSelect">选择</a-button>
           </a-form-item>
         </row-item>-->

src/views/repair/application-form/modules/RepairApplicationFormSelectModal.vue

@@ -120,7 +120,7 @@ export default {
           }
         },
        // {
-        //  title: '部件名称',
+        //  title: '部位名称',
          // dataIndex: 'partId',
          // customRender: (text, record, index) => {
          //   return record.partName

src/views/repair/application-form/modules/RepairApplicationFormTable.vue

@@ -135,7 +135,7 @@ export default {
           }
         }, */
         // {
-        // title: '部件名称',
+        // title: '部位名称',
         // dataIndex: 'partId',
         // checked: true,
         // customRender: (text, record, index) => {

src/views/repair/check/RepairCheck.vue

@@ -128,7 +128,7 @@ export default {
           dataIndex: 'sbName'
         },
         {
-          title: '部件名称',
+          title: '部位名称',
           dataIndex: 'partName',
           checked: true
         },

src/views/repair/check/modules/CheckForm.vue

@@ -26,7 +26,7 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="部件名称"
+            label="部位名称"
             class="marginBottom"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"

src/views/repair/check/modules/Detail.vue

@@ -11,7 +11,7 @@
     <detail-list title="" :col="2">
       <detail-list-item term="报修单号">{{ model.applicationNo }}</detail-list-item>
       <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
-      <detail-list-item term="部件名称">{{ model.partName }}</detail-list-item>
+      <detail-list-item term="部位名称">{{ model.partName }}</detail-list-item>
       <detail-list-item term="报修人">{{ model.repairUserName }}</detail-list-item>
       <detail-list-item term="报修来源">{{ BaseTool.Object.getField(this.sourceMap, model.applicationSource) }}</detail-list-item>
       <detail-list-item term="紧急等级"><badge :text="BaseTool.Object.getField(levelMap,model.applicationLevel)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[model.applicationLevel]"/></detail-list-item>

src/views/repair/check/modules/DispatchForm.vue

@@ -21,7 +21,7 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="部件名称"
+            label="部位名称"
             class="marginBottom"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"

src/views/repair/form/MyRepairForm.vue

@@ -147,7 +147,7 @@ export default {
           dataIndex: 'sbName'
         },
         // {
-        //  title: '部件名称',
+        //  title: '部位名称',
         //  dataIndex: 'partName',
         //  checked: true
         // },

src/views/repair/form/RepairForm.vue

@@ -146,7 +146,7 @@ export default {
           dataIndex: 'sbName'
         },
         // {
-        //  title: '部件名称',
+        //  title: '部位名称',
         //  dataIndex: 'partName',
         //  checked: true
         // },

src/views/repair/form/modules/Detail.vue

@@ -13,7 +13,7 @@
         <detail-list title="" :col="2">
           <detail-list-item term="报修单号">{{ model.applicationNo }}</detail-list-item>
           <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
-          <detail-list-item term="部件名称">{{ model.partName }}</detail-list-item>
+          <detail-list-item term="部位名称">{{ model.partName }}</detail-list-item>
           <detail-list-item term="计划性维修">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>
           <detail-list-item term="报修人">{{ model.repairUserName }}</detail-list-item>
           <detail-list-item term="报修来源">{{ BaseTool.Object.getField(this.sourceMap, model.applicationSource) }}</detail-list-item>

src/views/repair/form/modules/DispatchBaseForm.vue

@@ -21,7 +21,7 @@
         </row-item>
         <row-item>
           <a-form-item
-            label="部件名称"
+            label="部位名称"
             class="marginBottom"
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"

src/views/repair/form/modules/RepairFormTable.vue

@@ -152,7 +152,7 @@ export default {
           dataIndex: 'sbName'
         },
         {
-          title: '部件名称',
+          title: '部位名称',
           dataIndex: 'partName',
           checked: true
         },

src/views/repair/part-used/modules/BaseFormForRepair.vue

@@ -30,7 +30,7 @@
         </a-tree-select>
       </a-form-item>
       <a-form-item
-        label="部件名称"
+        label="部位名称"
         :labelCol="BaseTool.Constant.labelCol"
         :wrapperCol="BaseTool.Constant.wrapperCol"
       >

src/views/sb/info/SbInfoForPartInfo.vue

@@ -49,7 +49,7 @@
     >
       <span slot="action" slot-scope="record">
         <template>
-          <a @click="partInfoListView(record)">部件列表</a>
+          <a @click="partInfoListView(record)">部位列表</a>
         </template>
       </span>
       <span slot="status" slot-scope="text">
@@ -96,7 +96,7 @@ import PreviewModal from '@/views/preview/PreviewModal'
 import { getSbInfoPage, exportSbInfo } from '@/api/sb/info'
 import PartInfoList from '@/views/part/info/modules/PartInfoList'
 
-// 以设备为维度操作部件
+// 以设备为维度操作部位
 export default {
   name: 'SbInfoForPartInfo',
   components: {

src/views/sqarepartmanage/sparepartused/SparePartUsed.vue

@@ -121,7 +121,7 @@ export default {
           dataIndex: 'totalPrice'
         },
         //{
-         // title: '部件名称',
+         // title: '部位名称',
          // dataIndex: 'partId',
          // customRender: (text, record, index) => {
          //  return record.partName

src/views/sqarepartmanage/sparepartused/modules/BaseForm.vue

@@ -26,7 +26,7 @@
                   v-decorator="['sbName', {rules: [{required: false, message: '设备不能为空'}]}]" />
       </a-form-item>
       <!--<a-form-item
-        label="部件名称"
+        label="部位名称"
         :labelCol="BaseTool.Constant.labelCol"
         :wrapperCol="BaseTool.Constant.wrapperCol"
       >

src/views/sqarepartmanage/sparepartused/modules/Detail.vue

@@ -8,7 +8,7 @@
   >
     <detail-list title="" :col="2">
       <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
-      <!--<detail-list-item term="部件名称">{{ model.partName }}</detail-list-item>-->
+      <!--<detail-list-item term="部位名称">{{ model.partName }}</detail-list-item>-->
       <detail-list-item term="备件名称">{{ model.spareName }}</detail-list-item>
       <detail-list-item term="投用日期">{{ model.startDate }}</detail-list-item>
       <detail-list-item term="预计报废日期">{{ model.changeDate }}</detail-list-item>

src/views/sqarepartmanage/sparepartused/modules/SparePartUsedModal.vue

@@ -116,7 +116,7 @@ export default {
           }
         },
         {
-          title: '部件名称',
+          title: '部位名称',
           dataIndex: 'partId',
           customRender: (text, record, index) => {
             return record.partName

src/views/sqarepartmanage/sparepartused/modules/SparePartUsedSelectModal.vue

@@ -137,7 +137,7 @@ export default {
           }
         },
         {
-          title: '部件名称',
+          title: '部位名称',
           dataIndex: 'partId',
           customRender: (text, record, index) => {
             return record.partName