Quellcode durchsuchen

Merge branch 'develop_yh11' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_12

lilei vor 2 Jahren
Ursprung
Commit
9df34997fa

+ 4 - 3
src/views/reportData/purchaseReturnReport/purchaseReturnOrder.vue

@@ -57,7 +57,7 @@
     <!-- 合计 -->
     <!-- 合计 -->
     <a-alert type="info" style="margin-bottom:10px">
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
-        总单数:<strong>{{ dataList?dataList.length :'--' }}</strong>;
+        总单数:<strong>{{ statisticsNum?statisticsNum :'--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
         <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
           退货总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
           退货总成本:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
@@ -106,6 +106,7 @@ export default {
       },
       },
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
       exportLoading: false,
+      statisticsNum: null,
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
         this.disabled = true
         this.disabled = true
@@ -126,7 +127,7 @@ export default {
               this.disabled = false
               this.disabled = false
             }
             }
             this.$emit('spinning', false)
             this.$emit('spinning', false)
-            this.dataList = data.list
+            this.statisticsNum = data.count
             return data
             return data
           })
           })
         } else {
         } else {
@@ -220,7 +221,7 @@ export default {
       this.queryParam.purchaseReturnNo = undefined
       this.queryParam.purchaseReturnNo = undefined
       this.queryParam.returnTargetSn = undefined
       this.queryParam.returnTargetSn = undefined
       this.totalData = null
       this.totalData = null
-      this.dataList = null
+      this.statisticsNum = null
       this.$refs.ruleForm.resetFields()
       this.$refs.ruleForm.resetFields()
       this.$refs.table.clearTable()
       this.$refs.table.clearTable()
     },
     },

+ 11 - 8
src/views/reportData/urgentItemsOffsetReport/list.vue

@@ -33,7 +33,7 @@
               <a-input id="urgentItemsOffsetReport-buyerName" v-model.trim="queryParam.buyerName" allowClear placeholder="请输入客户名称"/>
               <a-input id="urgentItemsOffsetReport-buyerName" v-model.trim="queryParam.buyerName" allowClear placeholder="请输入客户名称"/>
             </a-form-model-item>
             </a-form-model-item>
           </a-col>
           </a-col>
-          <!-- <a-col :md="6" :sm="24">
+          <a-col :md="6" :sm="24">
             <a-form-item label="单据来源">
             <a-form-item label="单据来源">
               <v-select
               <v-select
                 v-model="queryParam.sourceType"
                 v-model="queryParam.sourceType"
@@ -43,7 +43,7 @@
                 placeholder="请选择单据来源"
                 placeholder="请选择单据来源"
                 allowClear></v-select>
                 allowClear></v-select>
             </a-form-item>
             </a-form-item>
-          </a-col> -->
+          </a-col>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="urgentItemsOffsetReport-refresh">查询</a-button>
             <a-button type="primary" @click="handleSearch" :disabled="disabled" id="urgentItemsOffsetReport-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="urgentItemsOffsetReport-reset">重置</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="urgentItemsOffsetReport-reset">重置</a-button>
@@ -63,7 +63,7 @@
     <!-- 合计 -->
     <!-- 合计 -->
     <a-alert type="info" style="margin-bottom:10px">
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
       <div class="ftext" slot="message">
-        总单数:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
+        总单数:<strong>{{basiceNum?basiceNum:'--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
           冲减总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</strong>。
           冲减总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? toThousands(totalData.totalCost) : '--' }}</strong>。
@@ -113,6 +113,7 @@ export default {
         'time': [{ required: true, message: '请选择冲减时间', trigger: 'change' }]
         'time': [{ required: true, message: '请选择冲减时间', trigger: 'change' }]
       },
       },
       disabled: false, //  查询、重置按钮是否可操作
       disabled: false, //  查询、重置按钮是否可操作
+      basiceNum:null,//列表数据
       exportLoading: false,
       exportLoading: false,
       // 加载数据方法 必须为 Promise 对象
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
       loadData: parameter => {
@@ -133,6 +134,7 @@ export default {
             this.disabled = false
             this.disabled = false
           }
           }
           this.spinning = false
           this.spinning = false
+          this.basiceNum=data.count
           return data
           return data
         })
         })
       },
       },
@@ -146,15 +148,15 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '急件单号', dataIndex: 'urgentBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '急件单号', dataIndex: 'urgentBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'bizBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'bizBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '单据来源', dataIndex: 'sourceTypeDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'buyerName', width: '20%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '款数', dataIndex: 'totalCategory', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '数量', dataIndex: 'totalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单据来源', dataIndex: 'sourceTypeDictValue', width: '12%', 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: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '数量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '成本', dataIndex: 'totalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '成本', dataIndex: 'totalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '冲减时间', dataIndex: 'offSetTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
         { title: '冲减时间', dataIndex: 'offSetTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(7, 0, { title: '成本', dataIndex: 'totalCost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(7, 0, { title: '成本', dataIndex: 'totalCost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       }
       return arr
       return arr
     }
     }
@@ -201,6 +203,7 @@ export default {
       this.$refs.rangeDate.resetDate()
       this.$refs.rangeDate.resetDate()
       this.$refs.ruleForm.resetFields()
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.totalData = null
+      this.basiceNum = null
       this.$refs.table.clearTable()
       this.$refs.table.clearTable()
     },
     },
     // 导出
     // 导出