修改刷新，打印，添加导出明细

src/views/warehouse/inStock/index.vue

@@ -131,11 +131,12 @@
             <td class="column" style="border: 1px solid #000; padding:10px" align="center">{{ detailForm.corpName }}
             </td>
             <td class="column" style="border: 1px solid #000; padding:10px" align="center">{{ item.fAmount }}</td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center">{{ item.fStltypeid }}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center"></td>
+<!--            <td class="column" style="border: 1px solid #000; padding:10px" align="center">{{ item.fStltypeid }}</td>-->
             <td class="column" style="border: 1px solid #000; padding:10px" align="center">
               {{ item.tProductdate }}/{{ item.fLotno }}
             </td>
-            <td class="column" style="border: 1px solid #000; padding:10px" align="center">{{ item.fValidName }}</td>
+            <td class="column" style="border: 1px solid #000; padding:10px" align="center">{{ item.fValid }}{{ item.fUnitsName }}</td>
             <td class="column" style="border: 1px solid #000; padding:10px" align="center">{{ item.fStoreEnvName }}</td>
             <td class="column" style="border: 1px solid #000; padding:10px" align="center">{{ item.fIsfillesName }}</td>
             <td class="column" style="border: 1px solid #000; padding:10px" align="center">
@@ -162,7 +163,7 @@ import {
   listInStock, addSave, getSave, getArea,
   getustomer, getEntry, getwarehouse, getGoodName,
   canBedelet, delRows, getWarehousekeeper, addWarehous,
-  deletMain, delFee, copyNew, listQuery, revokeBill, queryUserVal
+  deletMain, delFee, copyNew, listQuery, revokeBill, queryUserVal, exportInstock
 } from '@/api/warehouse/inStock'
 import Cookies from 'js-cookie'
 import { getliable } from '@/api/project'
@@ -813,8 +814,7 @@ export default {
           size: 'mini',
           icon: 'el-icon-edit',
           name: '打印',
-          disabled: false,
-          res: 1
+          disabled: false
         }, {
           type: 'info',
           size: 'mini',
@@ -829,7 +829,7 @@ export default {
           icon: 'el-icon-refresh',
           name: '刷新',
           disabled: false,
-          res: 1
+          // res: 1
         },
         {
           type: 'info',
@@ -837,6 +837,13 @@ export default {
           icon: 'el-icon-edit-outline',
           name: '生成出库单',
           disabled: false
+        },
+        {
+          type: 'primary',
+          size: 'mini',
+          icon: 'el-icon-download',
+          name: '导出明细',
+          disabled: false
         }
       ],
       confirmButton: [
@@ -1248,7 +1255,7 @@ export default {
             } else {
               for (let li in this.detailButton) {
                 if (this.detailButton[li].name == '录入明细' || this.detailButton[li].name == '保存' ||
-                  this.detailButton[li].name == '入库确认' || this.detailButton[li].name == '刷新') {
+                  this.detailButton[li].name == '入库确认') {
                   this.detailButton[li].disabled = true
                 }
               }
@@ -1775,7 +1782,7 @@ export default {
                   disabled: false
                 })
                 this.detailButton.forEach(item => {
-                  if (item.name === '录入明细' || item.name === '保存' || item.name === '修改' || item.name === '入库确认') {
+                  if (item.name === '录入明细' || item.name === '保存' || item.name === '修改' || item.name === '刷新' || item.name === '入库确认') {
                     item.disabled = true
                   }
                 })
@@ -1788,16 +1795,22 @@ export default {
         case '刷新':
           if (this.detailForm.fId) {
             getSave(this.detailForm.fId).then(res => {
-              if (res.data.warehouseBills) {
-                this.detailForm = res.data.warehouseBills
-                this.$set(this.detailForm, 'fStorekeeper', JSON.parse(this.detailForm.fStorekeeper))
-              }
-              if (res.data.tWarehousebillsfees) {
-                this.detailData = res.data.tWarehousebillsfees
-                for (let li in this.detailData) {
-                  this.$set(this.detailData[li], 'fFeeunitid', JSON.stringify(this.detailData[li].fFeeunitid))
-                  this.$set(this.detailData[li], 'fStltypeid', JSON.stringify(this.detailData[li].fStltypeid))
+              if(res.code == 200){
+                let list ={
+                  warehouseBills:res.data.warehouseBills,
+                  tWarehousebillsfees:res.data.tWarehousebillsfees
                 }
+                this.detailForm = list.warehouseBills
+                this.detailData = list.tWarehousebillsfees
+                this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
+                if(res.data.tWarehousebillsfees){
+                  this.detailData = res.data.tWarehousebillsfees
+                  for(let li in this.detailData){
+                    this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
+                    this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
+                  }
+                }
+                this.$message.success('刷新成功')
               }
             })
           }
@@ -1867,7 +1880,58 @@ export default {
             this.$message.error('数据未保存，请先保存')
           }
           break
+        case '导出明细':
+          if (!this.detailForm.fId) {
+            this.$message.error('数据未保存，请先保存')
+          } else {
+            let id = this.detailForm.fId
+            this.$confirm("是否确认导出入库明细?", "警告", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            }).then(function () {
+                return exportInstock({fPid: id})
+              }).then((response) => {
+                this.download(response.msg);
+              });
+          }
+          break
         case '打印':
+          let formData = new window.FormData()
+          formData.append('tWarehousebills', JSON.stringify(this.detailForm))
+          formData.append('tWarehousebillsfees', JSON.stringify(this.detailData))
+          formData.append('fBilltype', 'RK')
+          addSave(formData).then(res => {
+            if (res.code == 200) {
+              this.detailForm = res.data.warehouseBills
+              this.$set(this.detailForm, 'fStorekeeper', JSON.parse(this.detailForm.fStorekeeper))
+              this.detailData = res.data.tWarehousebillsCntrs
+              for (let li in this.detailData) {
+                this.$set(this.detailData[li], 'fFeeunitid', JSON.stringify(this.detailData[li].fFeeunitid))
+                this.$set(this.detailData[li], 'fStltypeid', JSON.stringify(this.detailData[li].fStltypeid))
+              }
+              // this.getList()
+              this.$message.success('保存成功')
+              getSave(this.detailForm.fId).then(res => {
+                if(res.code == 200){
+                  let list ={
+                    warehouseBills:res.data.warehouseBills,
+                    tWarehousebillsfees:res.data.tWarehousebillsfees
+                  }
+                  this.detailForm = list.warehouseBills
+                  this.detailData = list.tWarehousebillsfees
+                  this.$set(this.detailForm,'fStorekeeper',JSON.parse(this.detailForm.fStorekeeper))
+                  if(res.data.tWarehousebillsfees){
+                    this.detailData = res.data.tWarehousebillsfees
+                    for(let li in this.detailData){
+                      this.$set(this.detailData[li],'fFeeunitid',JSON.stringify(this.detailData[li].fFeeunitid))
+                      this.$set(this.detailData[li],'fStltypeid',JSON.stringify(this.detailData[li].fStltypeid))
+                    }
+                  }
+                }
+              })
+            }
+          })
           this.formList = this.detailForm
           this.dialogVisible = true
           break