完善

src/views/Login.vue

@@ -2,8 +2,8 @@
   <div>
     <div class="fh-login">
       <div class="fh-login-left">
-        <img src="../assets/company.png" alt="" width="350">
-        <h2>设备管理系统</h2>
+        <h2 style='padding-bottom: 0px'>CNTHB HITCH ABB</h2>
+        <h2 style='font-size:30px'>设备管理系统</h2>
       </div>
       <div class="fh-login-right">
         <div class="login-title">欢迎使用</div>

src/views/repair/application-form/RepairForm.vue

@@ -20,7 +20,7 @@
       </div>
 
       <div class="table-operator">
-        <a-button v-if="$auth('repair-application-forms-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>
+        <a-button v-if="$auth('repair-application-forms-add')" type="primary" icon="plus" @click="$refs.baseModal.base({},{filter: -1})">新增</a-button>
         <a-button style="margin-left: 8px" v-if="$auth('repair-application-forms-export')" type="primary" icon="download" @click="doExport">导出</a-button>
         <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('repair-application-forms-del')">
           <a-menu slot="overlay">

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

@@ -79,7 +79,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 || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)">
+    <div class="table-operator" v-if="$auth('repair-application-forms-finish')">
       <a-button type="primary" @click="handleRepairProjectSelect">
         <a-icon type="plus"/>
         添加
@@ -92,7 +92,6 @@
       rowKey="id">
       <span slot="action" slot-scope="record">
         <template>
-
           <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="batchDelete(record.relationId)">
             <a>删除</a>
           </a-popconfirm>
@@ -100,7 +99,7 @@
       </span>
     </a-table>
     <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 || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)">
+    <div class="table-operator" v-if="$auth('repair-application-forms-finish')">
       <a-button type="primary" @click="handleSpareSelect">
         <a-icon type="plus"/>
         添加

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

@@ -54,8 +54,8 @@
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
             <a-button type="primary" @click="handleAddPartUsed">更换备件</a-button>
-          </a-form-item>-->
-        </row-item>
+          </a-form-item>
+        </row-item>-->
       </row-list>
       <row-list>
         <row-item>
@@ -64,14 +64,7 @@
             :labelCol="BaseTool.Constant.labelCol"
             :wrapperCol="BaseTool.Constant.wrapperCol"
           >
-            <a-select v-decorator="['repairContent', {rules: [{required: true, message: '维修描述不能为空'}]}]" placeholder="请选择">
-              <a-select-option
-                v-for="(label,value) in descripitionMap"
-                :key="value"
-                :label="label"
-                :value="label">{{ label }}
-              </a-select-option>
-            </a-select>
+            <a-textarea v-decorator="['repairContent', {rules: [{required: true, message: '维修描述不能为空'}]}]"/>
           </a-form-item>
         </row-item>
       </row-list>

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

@@ -217,7 +217,6 @@
         </a-col>
       </a-row>
       <title-divider title="基本信息" width="90px"></title-divider>
-
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
@@ -272,6 +271,28 @@
           </a-form-item>
         </a-col>
       </a-row>
+      <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="大屏水平位置"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              v-decorator="['zjm']" placeholder="请输入水平位置，如300"/>
+          </a-form-item>
+        </a-col>
+        <a-col :lg="12" :md="24" :sm="24">
+          <a-form-item
+            label="大屏垂直位置"
+            :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol"
+          >
+            <a-input
+              v-decorator="['jbdh']" placeholder="请输入垂直位置，如200"/>
+          </a-form-item>
+        </a-col>
+      </a-row>
       <a-row class="form-row" :gutter="BaseTool.Constant.row.gutter">
         <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
@@ -721,6 +742,8 @@ export default {
           'remark',
           'zzh',
           'zz',
+          'zjm',
+          'jbdh',
           'useType'
         ])))
       })