检定完善

README.md

@@ -1,2 +1,2 @@
-# hitch-antd
+# HITACHI-antd
 

public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>logo.png">
-    <title>HITCH ABB</title>
+    <title>HITACHI ABB</title>
     <style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style>
     <!-- require cdn assets css -->
     <% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>

src/i18n/en.js

@@ -2,7 +2,7 @@ export const m = {
   // common
   common: {
     language: 'change language',
-    welcome: 'HITCH ABB',
+    welcome: 'HITACHI ABB',
     login: 'Sign In',
     remember: 'Remember password',
     system_name: 'Equipment management system',

src/utils/dict.js

@@ -770,7 +770,7 @@ DictCache.VALUE = {
     NOT_ALLOCATED: 1, // 待分配
     ALLOCATED: 2, // 已分配
     PROCESSING: 3, // 处理中
-    WAIT_SUBMIT: 31, // 处理中
+    WAIT_SUBMIT: 31, // 等待审核
     NOT_ACCEPTANCE: 4, // 待验收
     REBACK: 5, // 已驳回
     FINISHED: 6, // 已完成

src/utils/domUtil.js

@@ -16,4 +16,4 @@ export const setDocumentTitle = function (title) {
   }
 }
 
-export const domTitle = 'HITCH ABB'
+export const domTitle = 'HITACHI ABB'

src/views/Home.vue

@@ -2,7 +2,7 @@
   <div class="home">
     <div class="banner">
       <img alt="Vue logo" style="width: 64px; height: 64px" src="../assets/logo_custom.png">
-      <h3 style="margin-top: 1rem">HITCH ABB</h3>
+      <h3 style="margin-top: 1rem">HITACHI ABB</h3>
     </div>
 
     <br/>

src/views/Scan.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="fh-login">
-      <h2 style="font-size:30px;text-align: center;color: #fff">CNTHB HITCH ABB</h2>
+      <h2 style="font-size:30px;text-align: center;color: #fff">CNTHB HITACHI ABB</h2>
       <h2 style="font-size:30px;text-align: center;color: #fff">设备管理系统</h2>
       <div class="login-title">{{ user.realName }},辛苦了</div>
       <a-form

src/views/big-screen/RepairScreen.vue

@@ -14,7 +14,7 @@
 export default {
   data () {
     return {
-      url: '/hitch-screen/index.html',
+      url: '/HITACHI-screen/index.html',
       clientHeight: '1000px'
     }
   }

src/views/check/checkjob/CheckJob.vue

@@ -217,12 +217,6 @@ export default {
         // dataIndex: 'partName',
         // checked: true
         // },
-        {
-          title: '执行日期',
-          dataIndex: 'startTime',
-          checked: true,
-          width: '200px'
-        },
       /*  {
           title: '截至日期',
           dataIndex: 'endTime',
@@ -253,6 +247,13 @@ export default {
           checked: true,
           width: '200px'
         },
+        {
+          title: '执行日期',
+          dataIndex: 'startTime',
+          checked: true,
+          fixed: 'right',
+          width: '200px'
+        },
         {
           title: '任务状态',
           dataIndex: 'status',

src/views/purchase/purchase-plan/modules/PrintForm.vue

@@ -68,7 +68,7 @@
       <table class="gridtable list">
         <tbody>
           <tr >
-            <td colspan="6" style="height:90px;text-align:center;font-size: 20px;">Hitch ABB</br>{{ record.projectName }}项目采购计划单</td>
+            <td colspan="6" style="height:90px;text-align:center;font-size: 20px;">HITACHI ABB</br>{{ record.projectName }}项目采购计划单</td>
           </tr>
           <tr>
             <td>编号</td>

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

@@ -30,7 +30,7 @@
             <detail-list-item term="预留维修时间">{{ model.limitHours }}</detail-list-item>
             <detail-list-item term="使用位置">{{ model.sbCph }}</detail-list-item>
             <detail-list-item term="是否停机">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>
-            <detail-list-item term="报修人">{{ model.userName }}</detail-list-item>
+            <detail-list-item term="报修人">{{ model.actualUser }}</detail-list-item>
             <detail-list-item term="报修来源">{{ BaseTool.Object.getField(this.sourceMap, model.source) }}</detail-list-item>
             <detail-list-item term="紧急等级"><badge :text="BaseTool.Object.getField(levelMap,model.level)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[model.applicationLevel]"/></detail-list-item>
             <detail-list-item term="报修时间">{{ model.applyTime }}</detail-list-item>
@@ -88,7 +88,7 @@
         </a-layout-sider>
       </a-layout>
       <title-divider title="备件清单" width="90px"></title-divider>
-      <div class="table-operator" v-if="$auth('repair-application-forms-finish') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status">
+      <div class="table-operator" v-if="$auth('repair-application-forms-finish')">
         <a-button type="primary" @click="handleSpareStoreSelect">
           <a-icon type="plus"/>
           添加
@@ -102,9 +102,9 @@
         rowKey="id">
         <span slot="actionSpare" slot-scope="record">
           <template>
-            <a v-if="$auth('repair-application-forms-finish') &&( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" @click="handleEditSpare(record)">修改</a>
+            <a v-if="$auth('repair-application-forms-finish')" @click="handleEditSpare(record)">修改</a>
             <a-divider type="vertical" />
-            <a-popconfirm v-if="$auth('repair-application-forms-finish') && ( DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" title="是否要删除该条数据？" @confirm="batchDeleteSpare(record.id)">
+            <a-popconfirm v-if="$auth('repair-application-forms-finish')" title="是否要删除该条数据？" @confirm="batchDeleteSpare(record.id)">
               <a>删除</a>
             </a-popconfirm>
           </template>

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

@@ -1425,7 +1425,7 @@ export default {
       const zjm = getFieldValue('zjm')
       const jbdh = getFieldValue('jbdh')
       const a = document.createElement('a')
-      a.href = '/hitch-screen/point.html?id=' + this.id + '&zjm=' + zjm + '&jbdh=' + jbdh
+      a.href = '/HITACHI-screen/point.html?id=' + this.id + '&zjm=' + zjm + '&jbdh=' + jbdh
       a.target = '_blank'
       a.click()
     }

src/views/sqarepartmanage/sparepartinfo/SparePartInfo.vue

@@ -66,7 +66,7 @@
                   </a-select>
                 </a-form-item>
               </a-col>
-              <!--<a-col :md="6" :sm="24">
+              <a-col :md="6" :sm="24">
                 <a-form-item label="用途">
                   <a-select v-model="queryParam.yt"  placeholder="请选择">
                     <a-select-option
@@ -77,7 +77,7 @@
                      </a-select-option>
                   </a-select>
                 </a-form-item>
-              </a-col>-->
+              </a-col>
               <a-col :md="6 || 24" :sm="24">
                 <span class="table-page-search-submitButtons">
                   <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>

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

@@ -192,7 +192,7 @@
             </a-select>
           </a-form-item>
         </row-item>
-<!--        <row-item>
+        <!--        <row-item>
           <a-form-item
             label="包装单位"
             :labelCol="BaseTool.Constant.labelCol"
@@ -365,6 +365,22 @@
               v-decorator="['params']" />
           </a-form-item>
         </row-item>
+        <row-item>
+          <a-form-item
+            label="用途"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-select v-decorator="['yt', {rules: [{required: true, message: '类型用途不能为空'}]}]" placeholder="请选择">
+              <a-select-option
+                v-for="(label,value) in ytMap"
+                :key="value"
+                :label="label"
+                :value="parseInt(value)">{{ label }}
+              </a-select-option>
+            </a-select>
+          </a-form-item>
+        </row-item>
         <row-item>
           <a-form-item
             label="备注"
@@ -598,7 +614,7 @@ export default {
           'middleName',
           'cd',
           'ggxh',
-          // 'yt',
+          'yt',
           'zjm',
           'zbh',
           'maxStock',

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

@@ -36,7 +36,7 @@
       <detail-list-item term="英文名称">{{ model.englishName }}</detail-list-item>
       <detail-list-item term="助记码">{{ model.zjm }}</detail-list-item>
       <detail-list-item term="产地">{{ BaseTool.Object.getField(cdMap,model.cd) }}</detail-list-item>
-      <!--<detail-list-item term="用途">{{ BaseTool.Object.getField(ytMap,model.yt) }}</detail-list-item>-->
+      <detail-list-item term="用途">{{ BaseTool.Object.getField(ytMap,model.yt) }}</detail-list-item>
       <detail-list-item term="参数">{{ model.params }}</detail-list-item>
       <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
       <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>