Browse Source

bug 修复

lilei 2 năm trước cách đây
mục cha
commit
20f90866ae

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1657532589999
+  "version": 1657591326326
 }

+ 19 - 0
src/api/reportData.js

@@ -632,3 +632,22 @@ export const reportStockPutOutMonthExport = params => {
     responseType: 'blob'
   })
 }
+// 库存导入报表
+export const reportStockImportList = (params) => {
+  const url = `/report/reportStockImport/reportPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+export const reportStockImportCount = (params) => {
+  const url = `/report/reportStockImport/reportCount`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 4 - 4
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -98,14 +98,14 @@
           <a-button
             size="small"
             type="link"
-            v-if="(record.hasStockBill == '0' && (record.state == 'CHECKED'||record.state == 'FINISH')) && $hasPermissions('B_purchaseReturnOutStock')"
+            v-else-if="(record.hasStockBill == '0' && (record.state == 'CHECKED'||record.state == 'FINISH')) && $hasPermissions('B_purchaseReturnOutStock')"
             @click="handleWarehouse(record)"
             class="button-primary"
             id="bulkReturnGoodsList-warehouse-btn">生成出库单</a-button>
           <a-button
             size="small"
             type="link"
-            v-if="record.state == 'CHECKED' && $hasPermissions('B_purchaseReturnFinishBill')"
+            v-else-if="record.state == 'CHECKED' && $hasPermissions('B_purchaseReturnFinishBill')"
             @click="handleFinishBill(record)"
             class="button-primary"
             id="bulkReturnGoodsList-warehouse-btn">完结单据</a-button>
@@ -113,10 +113,10 @@
             size="small"
             type="link"
             class="button-error"
-            v-if="(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && $hasPermissions('B_purchaseReturnDel')"
+            v-else-if="(record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && $hasPermissions('B_purchaseReturnDel')"
             @click="handleDel(record)"
             id="purchaseReturnList-del-btn">删除</a-button>
-          <span v-if="!((record.state == 'WAIT_SUBMIT' || record.state == 'AUDIT_REJECT') && ($hasPermissions('B_purchaseReturnEdit') || $hasPermissions('B_purchaseReturnDel'))) && !(record.hasStockBill == '0' && ($hasPermissions('B_purchaseReturnOutStock') || $hasPermissions('B_purchaseReturnFinishBill')))">--</span>
+          <span v-else>--</span>
         </template>
       </s-table>
     </a-spin>

+ 12 - 6
src/views/reportData/stockImportReport/detailList.vue

@@ -20,12 +20,16 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-model-item label="导入类型">
-              <v-select
-                v-model="queryParam.salesBillSource"
-                ref="salesBillSource"
-                code="SALES_SOURCE"
+              <a-select
                 placeholder="请选择导入类型"
-                allowClear></v-select>
+                v-model="queryParam.importType">
+                <a-select-option value="STOCK_IMPORT">
+                  库存导入
+                </a-select-option>
+                <a-select-option value="SPARE_PARTS_IMPORT">
+                  散件导入
+                </a-select-option>
+              </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -224,7 +228,9 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.$refs.rangeDate.resetDate()
+      if (this.advanced) {
+        this.$refs.rangeDate.resetDate()
+      }
       this.queryParam.time = []
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''

+ 26 - 22
src/views/reportData/stockImportReport/list.vue

@@ -15,12 +15,16 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-model-item label="导入类型">
-              <v-select
-                v-model="queryParam.salesBillSource"
-                ref="salesBillSource"
-                code="SALES_SOURCE"
+              <a-select
                 placeholder="请选择导入类型"
-                allowClear></v-select>
+                v-model="queryParam.importType">
+                <a-select-option value="STOCK_IMPORT">
+                  库存导入
+                </a-select-option>
+                <a-select-option value="SPARE_PARTS_IMPORT">
+                  散件导入
+                </a-select-option>
+              </a-select>
             </a-form-model-item>
           </a-col>
           <a-col :md="6" :sm="24">
@@ -38,10 +42,10 @@
     <!-- 合计 -->
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
-        总单数:<strong>{{ (totalData && (totalData.totalCategory || totalData.totalCategory==0)) ? totalData.totalCategory : '--' }}</strong>;
-        产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
+        总单数:<strong>{{ (totalData && (totalData.totalRowSize || totalData.totalRowSize==0)) ? totalData.totalRowSize : '--' }}</strong>;
+        产品总数量:<strong>{{ (totalData && (totalData.productTotalQty || totalData.productTotalQty==0)) ? totalData.productTotalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? '¥'+totalData.totalCost : '--' }}</strong>。
+          总成本:<strong>{{ (totalData && (totalData.productTotalCost || totalData.productTotalCost==0)) ? '¥'+totalData.productTotalCost : '--' }}</strong>。
         </div>
       </div>
     </a-alert>
@@ -63,7 +67,7 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
-import { reportSalesReturnPageList, reportSalesReturnBillTotal } from '@/api/reportData'
+import { reportStockImportList, reportStockImportCount } from '@/api/reportData'
 export default {
   components: { STable, VSelect, rangeDate },
   mixins: [commonMixin],
@@ -78,8 +82,7 @@ export default {
         time: [],
         beginDate: '',
         endDate: '',
-        buyerName: '',
-        salesReturnNo: ''
+        importType: undefined
       },
       rules: {
         'time': [{ required: true, message: '请选择导入时间', trigger: 'change' }]
@@ -92,7 +95,7 @@ export default {
         const params = Object.assign(parameter, this.queryParam)
         this.spinning = true
         delete params.time
-        return reportSalesReturnPageList(params).then(res => {
+        return reportStockImportList(params).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -115,15 +118,15 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '库存导入单', dataIndex: 'salesReturnNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '导入类型', dataIndex: 'buyerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '款数', dataIndex: 'totalCategory', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '数量', dataIndex: 'totalQty', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '库存导入单', dataIndex: 'stockImportNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '导入类型', dataIndex: 'importTypeDictValue', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '款数', dataIndex: 'productTotalCategory', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '数量', dataIndex: 'productTotalQty', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '成本', dataIndex: 'totalCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '导入时间', dataIndex: 'auditTime', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '导入时间', dataIndex: 'importTime', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(5, 0, { title: '成本', dataIndex: 'totalCost', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(5, 0, { title: '成本', dataIndex: 'productTotalCost', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       return arr
     }
@@ -131,7 +134,7 @@ export default {
   methods: {
     // 合计
     getCount (params) {
-      reportSalesReturnBillTotal(params).then(res => {
+      reportStockImportCount(params).then(res => {
         if (res.status == 200) {
           this.totalData = res.data
         } else {
@@ -158,15 +161,16 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.$refs.rangeDate.resetDate()
       this.queryParam.time = []
       this.queryParam.beginDate = ''
       this.queryParam.endDate = ''
-      this.queryParam.salesReturnNo = ''
-      this.queryParam.buyerName = ''
+      this.queryParam.importType = undefined
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.$refs.table.clearTable()
+      this.$nextTick(() => {
+        this.$refs.rangeDate.resetDate()
+      })
     },
     pageInit () {}
   },

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.215:8076/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.0.215:8076/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,