Browse Source

Merge branch 'deploy_0804' of jianguan-web/qpls-md-html into master

陈瑞 4 years ago
parent
commit
92dd759dee

+ 1 - 1
src/config/defaultSettings.js

@@ -28,6 +28,6 @@ export default {
   storageOptions: {
     namespace: 'pro__', // key prefix
     name: 'ls', // name variable Vue.[ls] or this.[$ls],
-    storage: 'local' // storage name session, local, memory
+    storage: 'session' // storage name session, local, memory
   }
 }

+ 2 - 2
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -21,7 +21,7 @@
             <a-descriptions-item label="单位类型">{{ (basicInfoData&&basicInfoData.settleClientTypeDictValue) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="结算类型">{{ (basicInfoData&&basicInfoData.settleTypeDictValue) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="应结算金额">{{ (basicInfoData&&(basicInfoData.settleAmount || basicInfoData.settleAmount==0)) ? basicInfoData.settleAmount : '--' }}</a-descriptions-item>
-            <a-descriptions-item label="折让金额">{{ discountAmount || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="折让金额">{{ (discountAmount || discountAmount==0) ? discountAmount : '--' }}</a-descriptions-item>
             <a-descriptions-item label="实结算金额">{{ (basicInfoData&&(basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0)) ? basicInfoData.realSettleAmount : '--' }}</a-descriptions-item>
             <a-descriptions-item label="结算时间">{{ (basicInfoData&&basicInfoData.createDate) || '--' }}</a-descriptions-item>
             <a-descriptions-item label="操作人">{{ (basicInfoData&&basicInfoData.operateName) || '--' }}</a-descriptions-item>
@@ -84,7 +84,7 @@ export default {
             data.list[i].no = no + i + 1
           }
           this.disabled = false
-          this.total = data.list.length || 0
+          this.total = data.count || 0
           return data
         })
       },

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -111,7 +111,7 @@ export default {
             data.list[i].no = no + i + 1
           }
           this.disabled = false
-          this.total = data.list.length || 0
+          this.total = data.count || 0
           this.getTotal(params)
           return data
         })

+ 1 - 1
src/views/financialManagement/ledgerRecord/list.vue

@@ -111,7 +111,7 @@ export default {
             data.list[i].no = no + i + 1
           }
           this.disabled = false
-          this.total = data.list.length || 0
+          this.total = data.count || 0
           this.getTotal(Object.assign(parameter, this.queryParam))
           return data
         })

+ 2 - 2
src/views/financialManagement/warehousingAudit/detail.vue

@@ -77,9 +77,9 @@ export default {
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购数量', dataIndex: 'qty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '入库数量', dataIndex: 'putQty', width: 110, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '成本价', dataIndex: 'price', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '成本价', dataIndex: 'discountedPrice', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '入库小计', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '入库小计', dataIndex: 'discountedAmount', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库', dataIndex: 'warehouseEntity.name', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓位', dataIndex: 'warehouseLocationEntity.name', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],

+ 1 - 1
src/views/reportData/stockExpenditureReport/list.vue

@@ -203,7 +203,7 @@ export default {
       this.spinning = true
       reportStockOutList(params).then(res => {
         this.listLoading = false
-        if (res.status == 200) {
+        if (res.status == 200 && res.data) {
           const reportStockOutVOList = (res.data && res.data.reportStockOutVOList) ? res.data.reportStockOutVOList : []
           const totalQty = (res.data && (res.data.totalQty || res.data.totalQty == 0)) ? res.data.totalQty : '--'
           const totalPrice = (res.data && (res.data.totalPrice || res.data.totalPrice == 0)) ? res.data.totalPrice : '--'

+ 1 - 1
src/views/reportData/stockIncomeReport/list.vue

@@ -203,7 +203,7 @@ export default {
       this.spinning = true
       reportStockPutList(params).then(res => {
         this.listLoading = false
-        if (res.status == 200) {
+        if (res.status == 200 && res.data) {
           const reportStockPutVOList = (res.data && res.data.reportStockPutVOList) ? res.data.reportStockPutVOList : []
           const totalQty = (res.data && (res.data.totalQty || res.data.totalQty == 0)) ? res.data.totalQty : '--'
           const totalPrice = (res.data && (res.data.totalPrice || res.data.totalPrice == 0)) ? res.data.totalPrice : '--'

+ 4 - 4
src/views/salesManagement/salesQuery/chooseCustomModal.vue

@@ -19,13 +19,13 @@
         :wrapper-col="formItemLayout.wrapperCol"
       >
         <a-row :gutter="15">
-          <a-col :span="8">
-            <a-form-model-item label="客户名称" prop="buyerSn">
+          <a-col :span="16">
+            <a-form-model-item label="客户名称" prop="buyerSn" :labelCol="{ span: 3 }" :wrapperCol="{ span: 20 }">
               <custList ref="custList" id="chooseCustom-buyerSn" @change="custChange" v-model="form.buyerSn"></custList>
             </a-form-model-item>
           </a-col>
-          <a-col :span="16" v-if="$hasPermissions('B_customer_customerInfo_add')">
-            <a-form-model-item>
+          <a-col :span="8" v-if="$hasPermissions('B_customer_customerInfo_add')">
+            <a-form-model-item :labelCol="{ span: 0 }" :wrapperCol="{ span: 24 }">
               <a-button type="primary" class="button-primary" @click="openNewCust" icon="plus">新增</a-button>
               (点击新增按钮新增客户)
             </a-form-model-item>

+ 2 - 2
src/views/salesManagement/salesReturn/chooseCustomModal.vue

@@ -19,8 +19,8 @@
         :wrapper-col="formItemLayout.wrapperCol"
       >
         <a-row :gutter="15">
-          <a-col :span="8">
-            <a-form-model-item label="客户名称" prop="buyerSn">
+          <a-col :span="16">
+            <a-form-model-item label="客户名称" prop="buyerSn" :labelCol="{ span: 3 }" :wrapperCol="{ span: 20 }">
               <custList ref="custList" @change="custChange" v-model="form.buyerSn"></custList>
             </a-form-model-item>
           </a-col>