完善

src/views/dashboard/RepairReportFail.vue

@@ -117,7 +117,7 @@ export default {
           dataIndex: 'name'
         },
         {
-          title: '设备编号',
+          title: '设备位号',
           width: 120,
           dataIndex: 'no'
         },

src/views/store/outstoreform/modules/DetailYY.vue

@@ -16,6 +16,7 @@
       <detail-list-item term="类型">{{ BaseTool.Object.getField(typeMap,model.type) }}</detail-list-item>
       <detail-list-item term="申请部门">{{ BaseTool.Object.getField(deptYYMap,model.applyDept) }}</detail-list-item>
       <detail-list-item term="仓库">{{ model.storeName }}</detail-list-item>
+      <detail-list-item term="项目">{{ model.projectName }}</detail-list-item>
       <detail-list-item term="状态"><badge :text="BaseTool.Object.getField(statusMap,model.status)" :status="statusMap[model.status]"/></detail-list-item>
       <detail-list-item term="是否出库"><badge :text="BaseTool.Object.getField(yesNoMap,model.outFlag)" :status="statusMap[model.status]"/></detail-list-item>
       <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>
@@ -39,7 +40,7 @@
     </a-table>
 
     <history ref="history" :audit="false" :ok="handleCancel"></history>
-  </a-card>
+    </detail-list-item></a-card>
 </template>
 
 <script>
@@ -149,7 +150,7 @@ export default {
     // 下拉框map
     // this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_TYPE)
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_STATUS)
-    this.deptYYMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_DEPT_CODE)
+    this.deptYYMap = { ...this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_DEPT_CODE), ...this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBB) }
     this.yesNoMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
   },
   methods: {

src/views/store/outstoreform/modules/TicketForm.vue

@@ -10,14 +10,8 @@
         <div style="font-size:26px;font-weight:700">{{ BaseTool.Object.getField(typeMap,model.type) }}</div>
       </div>
       <div style="display:flex;justify-content:space-between; margin: 10px auto;width: 1030px;">
-        <span v-show="model.applyDept === '13'">
-          设备部
-        </span>
-        <span v-show="model.applyDept === '19'">
-          生产部
-        </span>
-        <span v-show="model.applyDept === '09'">
-          筹建部
+        <span>
+          {{ BaseTool.Object.getField(deptYYMap,model.applyDept) }}
         </span>
         <div>维修单号：{{ model.repairNo }}</div>
         <div>单号：{{ model.yyId }}</div>
@@ -95,6 +89,7 @@ export default {
       value1: 1,
       type: true,
       typeMap: {},
+      deptYYMap: {},
       model: {
         'yyId': null,
         'userTime': null,
@@ -113,6 +108,7 @@ export default {
   created () {
     // 下拉框map
     // this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_TYPE)
+    this.deptYYMap = { ...this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_DEPT_CODE), ...this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBB) }
   },
   methods: {
     base (record, type) {