完善出库和退库报表

src/views/store/outstoreform/OutStoreFormBackYY.vue

@@ -1,5 +1,5 @@
 <template>
-  <OutStoreFormYY :is-out="0"/>
+  <OutStoreFormYY :out-flag="0"/>
 </template>
 
 <script>

src/views/store/outstoreform/OutStoreFormYY.vue

@@ -119,7 +119,7 @@ export default {
       type: Number,
       default: -1
     },
-    isOut: {
+    outFlag: {
       type: Number,
       default: 1
     }
@@ -129,7 +129,7 @@ export default {
       // 查询参数
       queryParam: {
         filter: this.filter,
-        isOut: this.isOut,
+        outFlag: this.outFlag,
         ...this.$route.query
       },
       // 表头
@@ -205,7 +205,7 @@ export default {
   },
   created () {
     // 下拉框map
-    if (this.isOut === 1) {
+    if (this.outFlag === 1) {
       this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_TYPE)
     } else {
       this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SPARE_BACK_FORM_TYPE)
@@ -260,7 +260,7 @@ export default {
       this.visible = false
       fetchOutStoreForm({ id: record.id }).then(res => {
         const modal = this.$refs.ticketForm
-        modal.base(res.data, this.isOut)
+        modal.base(res.data, this.outFlag)
       })
     },
     handleView (record) {
@@ -273,7 +273,7 @@ export default {
     handleAdd () {
       this.visible = false
       const modal = this.$refs.baseModal
-      modal.base({ isOut: this.isOut })
+      modal.base({ outFlag: this.outFlag })
     },
     handleEdit (record) {
       this.visible = false

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

@@ -5,7 +5,7 @@
         <a-input v-decorator="['id']" type="hidden"/>
         <a-input v-decorator="['storeId']" type="hidden"/>
         <a-input v-decorator="['pickId']" type="hidden"/>
-        <a-input v-decorator="['isOut']" type="hidden"/>
+        <a-input v-decorator="['outFlag']" type="hidden"/>
       </a-form-item>
       <a-row :gutter="24">
         <a-col :lg="12" :md="24" :sm="24">
@@ -193,7 +193,7 @@ export default {
       form: this.$form.createForm(this),
       visible: false,
       maskClosable: false,
-      isOut: 1,
+      outFlag: 1,
       storeId: null,
       // 下拉框map
       typeMap: {},
@@ -231,8 +231,7 @@ export default {
         {
           title: '库存',
           dataIndex: 'storeNum',
-          width: 150,
-          scopedSlots: { customRender: 'num' }
+          width: 150
         },
         {
           title: '单位',
@@ -283,8 +282,8 @@ export default {
   methods: {
     base (record) {
       this.visible = true
-      this.isOut = record.isOut
-      if (record.isOut === 1) {
+      this.outFlag = record.outFlag
+      if (record.outFlag === 1) {
         this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_TYPE)
       } else {
         this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SPARE_BACK_FORM_TYPE)
@@ -305,7 +304,7 @@ export default {
         // 日期处理
         this.$nextTick(() => {
           setFieldsValue(Object.assign(pick(record, [
-            'isOut'
+            'outFlag'
           ])))
         })
         return
@@ -343,6 +342,7 @@ export default {
           this.confirmLoading = false
           return
         }
+        values.outFlag = this.outFlag
         values.detailList = this.data
         values.userTime = BaseTool.Date.formatter(values.userTime, BaseTool.Date.PICKER_NORM_DATE_PATTERN)
         // 日期处理
@@ -491,7 +491,7 @@ export default {
       }
       const data = [...this.data]
       const target = data.find(item => item.autoId === autoId)
-      if (this.isOut === 1 && value > target.storeNum) {
+      if (this.outFlag === 1 && value > target.storeNum) {
         this.$message.error('领用数量不能大于库存数量')
         target[attr] = 1
         return

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

@@ -15,7 +15,7 @@
       <detail-list-item term="类型">{{ BaseTool.Object.getField(typeMap,model.type) }}</detail-list-item>
       <detail-list-item term="仓库">{{ model.storeName }}</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.isOut)" :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>
       <detail-list-item term="更新人">{{ model.updateUserName }}</detail-list-item>
       <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
@@ -141,7 +141,7 @@ export default {
       this.model = record
       this.data = record.detailList
       const modal = this.$refs.history
-      if (record.isOut === 1) {
+      if (record.outFlag === 1) {
         this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_TYPE)
       } else {
         this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SPARE_BACK_FORM_TYPE)

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

@@ -15,7 +15,7 @@
       <detail-list-item term="类型">{{ BaseTool.Object.getField(typeMap,model.type) }}</detail-list-item>
       <detail-list-item term="仓库">{{ model.storeName }}</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.isOut)" :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>
       <detail-list-item term="更新人">{{ model.updateUserName }}</detail-list-item>
       <detail-list-item term="更新日期">{{ model.updateTime }}</detail-list-item>
@@ -134,7 +134,7 @@ export default {
       this.modalTitle = '详情'
       this.model = record
       this.data = record.detailList
-      if (record.isOut === 1) {
+      if (record.outFlag === 1) {
         this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_TYPE)
       } else {
         this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SPARE_BACK_FORM_TYPE)

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

@@ -112,7 +112,7 @@ export default {
       console.log(record)
       this.type = type
       this.model = record
-      if (record.isOut === 1) {
+      if (record.outFlag === 1) {
         this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.OUT_STORE_FORM_TYPE)
       } else {
         this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SPARE_BACK_FORM_TYPE)