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

src/router/generator-platform-routers.js

@@ -78,6 +78,8 @@ const constantRouterComponents = {
   'SpecialSbInfo': () => import('@/views/sb/info/SpecialSbInfo'),
   // 特种设备预警
   'SpecialSbInfoWarn': () => import('@/views/sb/info/SpecialSbInfoWarn'),
+  // 特种设备在库
+  'SpecialSbInfoInStore': () => import('@/views/sb/info/SpecialSbInfoInStore'),
   // 父子设备树
   'ParentSbInfo': () => import('@/views/sb/info/ParentSbInfo'),
   // 设别型号库

src/views/sb/info/SbInfo.vue

@@ -344,7 +344,7 @@ export default {
         isSelf: this.isSelf,
         id: this.$route.query.id,
         typeId: this.$route.query.typeId,
-        status: this.$route.query.status
+        status: this.$route.query.status || this.status
       },
       depreciationTypeMap: {},
       visible: true,
@@ -805,7 +805,7 @@ export default {
         isSelf: this.isSelf,
         id: this.$route.query.id,
         typeId: this.$route.query.typeId,
-        status: this.$route.query.status
+        status: this.$route.query.status || this.status
       }
       this.visible = true
       this.$refs.table.refresh(true)

src/views/sb/info/SpecialSbInfoInStore.vue

@@ -0,0 +1,18 @@
+<template>
+  <SbInfo :use-type="5" :is-measure="1" :measure-status="1" :status="1">
+  </sbinfo>
+</template>
+
+<script>
+import SbInfo from './SbInfo'
+export default {
+  name: 'SpecialSbInfoInStore',
+  components: {
+    SbInfo
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -156,7 +156,6 @@ export default {
   components: {
     SbInfoSelectModal,
     SbPositionNoModal
-
   },
   data () {
     return {
@@ -325,7 +324,6 @@ export default {
     },
     save () {
       let status = false
-
       this.ListForm.forEach(item => {
         switch (true) {
           case item.sbStatus || (item.requirement === '' && (item.lastDate === '' || item.lastDate === null)) :

src/views/store/outstoreform/OutStoreFormYY.vue

@@ -62,7 +62,7 @@
             <a-divider v-if="(record.status==0 || record.status == 3)" type="vertical" />
             <a v-if="$auth('store-out-store-forms-edit')&&(record.status==0 || record.status == 3)" @click="handleEdit(record)">修改</a>
             <a-divider v-if="record.status == 5 || record.status == 4" type="vertical" />
-            <a v-if="record.status == 4 || record.status == 5" @click="handleViewTicket(record)">打印</a>
+            <a v-if="record.status == 0 || record.status == 4 || record.status == 5" @click="handleViewTicket(record)">打印</a>
             <a-divider v-if="record.status==0" type="vertical" />
             <a-popconfirm v-if="record.status==0" title="是否提交审核？" @confirm="updateStore(record.id)">
               <a>提交审核</a>
@@ -145,13 +145,13 @@ export default {
           title: '出库单号',
           dataIndex: 'outNo'
         },
-        /*  {
+        {
           title: '出库类型',
           dataIndex: 'type',
           customRender: (text, record, index) => {
             return this.BaseTool.Object.getField(this.typeMap, text)
           }
-        }, */
+        },
         {
           title: '状态',
           dataIndex: 'status',

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

@@ -51,7 +51,7 @@
             </a-tree-select>
           </a-form-item>
         </a-col>-->
-        <!--        <a-col :lg="12" :md="24" :sm="24">
+        <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="出库类型"
             :labelCol="BaseTool.Constant.labelCol"
@@ -66,7 +66,7 @@
               </a-select-option>
             </a-select>
           </a-form-item>
-        </a-col>-->
+        </a-col>
         <!--        <a-col :lg="12" :md="24" :sm="24">
           <a-form-item
             label="操作人"

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

@@ -7,7 +7,7 @@
     <div id="print-container2">
       <div class="title">
         <div style="font-size:26px;"><span style="font-size:30px;font-weight:700;vertical-align: middle;letter-spacing:.2em;">时代思康新材料有限公司</span></div>
-        <div style="font-size:26px;font-weight:700">{{ type? '物资领料单':'物资退库单' }}</div>
+        <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;">
 <!--        <a-radio-group v-if="type" v-model="value1">
@@ -86,9 +86,11 @@ export default {
       disabled: false,
       value1: 1,
       type: true,
+      typeMap: {},
       model: {
         'yyId': null,
         'userTime': null,
+        'type': null,
         'sbNo': null,
         'sbName': null,
         'sbLocation': null,
@@ -99,6 +101,10 @@ export default {
       }
     }
   },
+  created () {
+    // 下拉框map
+    this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_TYPE)
+  },
   methods: {
     base (record, type) {
       this.visible = true